Attachment 16834 Details for Bug 15169 – Make xserver build on Alpha

[patch] Make xserver build on Alpha

pcirework_on_Alpha-02.patch (text/plain), 3.26 KB, created by Ian Romanick on 2008-05-30 11:14:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2008-05-30 11:14:57 UTC

Size: 3.26 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index 3cec454..09d1ff9 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1351,8 +1351,8 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
> 			;;
> 		  alpha*)
> 		  	linux_alpha=yes
>-			XORG_OS_PCI="axp"
>-			xorg_bus_linuxpci="no"
>+#			XORG_OS_PCI="axp"
>+#			xorg_bus_linuxpci="no"
> 			;;
> 		  i*86|amd64*|x86_64*)
> 			linux_acpi="yes"
>diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
>index 5a15430..0989101 100644
>--- a/hw/xfree86/os-support/bus/Makefile.am
>+++ b/hw/xfree86/os-support/bus/Makefile.am
>@@ -23,9 +23,9 @@ if XORG_BUS_SPARCPCI
> PCI_SOURCES += sparcPci.c
> endif
> 
>-if LINUX_ALPHA
>-PCI_SOURCES += axpPci.c
>-endif
>+#if LINUX_ALPHA
>+#PCI_SOURCES += axpPci.c
>+#endif
> 
> if XORG_BUS_SPARC
> PLATFORM_SOURCES = Sbus.c
>diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
>index 1385eee..557483b 100644
>--- a/hw/xfree86/os-support/bus/Pci.h
>+++ b/hw/xfree86/os-support/bus/Pci.h
>@@ -189,75 +189,26 @@
> #define ARCH_PCI_INIT bsdPciInit
> #endif
> 
>+#if defined(linux)
>+# define ARCH_PCI_INIT linuxPciInit
>+# if defined(__m32r__)
>+#  define INCLUDE_XF86_MAP_PCI_MEM
>+#  define INCLUDE_XF86_NO_DOMAIN
>+# endif
>+#endif /* defined(linux) */
>+
>+
> #if !defined(ARCH_PCI_INIT)
> /*
>  * Select architecture specific PCI init function
>  */
>-#if defined(__alpha__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT axpPciInit
>-# endif
>-#elif defined(__arm__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__hppa__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__ia64__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__i386__) || defined(__i386)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# else
>-#  define ARCH_PCI_INIT ix86PciInit
>-# endif
>-#elif defined(__mc68000__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__mips__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>+#if defined(__i386__) || defined(__i386) ||  defined(__amd64__) || defined(__amd64) || defined(__x86_64__)
>+# define ARCH_PCI_INIT ix86PciInit
> #elif defined(__powerpc__) || defined(__powerpc64__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# else
>-#  define ARCH_PCI_INIT ppcPciInit
>-# endif
>-#elif defined(__s390__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__sh__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# endif
>-#elif defined(__m32r__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-#  define INCLUDE_XF86_MAP_PCI_MEM
>-#  define INCLUDE_XF86_NO_DOMAIN
>-# endif
>+# define ARCH_PCI_INIT ppcPciInit
> #elif defined(__sparc__) || defined(sparc)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# elif defined(sun)
>-#  define ARCH_PCI_INIT sparcPciInit
>-# endif
>-# if !defined(__FreeBSD__) && !defined(linux)
>-#  define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
>-# endif
>-#elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__)
>-# if defined(linux)
>-#  define ARCH_PCI_INIT linuxPciInit
>-# else
>-#  define ARCH_PCI_INIT ix86PciInit
>-# endif
>+# define ARCH_PCI_INIT sparcPciInit
>+# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
> #endif
> #endif /* !defined(ARCH_PCI_INIT) */
>

Actions: View | Splinter Review

Attachments on bug 15169: 16834

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.