summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike A. Harris <mharris@redhat.com>2004-03-11 09:16:51 +0000
committerMike A. Harris <mharris@redhat.com>2004-03-11 09:16:51 +0000
commit4565ca2a8c681f16f6e863b29381ebdded15365d (patch)
treec78fac90b75d26251dd7a21aaa5ee2ba7aa0d80f
parent17bed525634aac7acd446738ba8147bcb39dccdc (diff)
Added initial support for PowerPC 64 (ppc64) architecture. (Mike A. Harris,
Elliot Lee, SuSE)
-rw-r--r--fb/fb.h1
-rw-r--r--hw/xfree86/os-support/bus/Pci.h2
-rw-r--r--os/xalloc.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/fb/fb.h b/fb/fb.h
index f90a3499e..d43e59493 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -106,6 +106,7 @@ typedef unsigned __int64 FbBits;
defined(__sparc64__) || \
defined(__s390x__) || \
defined(amd64) || defined (__amd64__) || \
+ defined (__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits;
# else
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index b0c767d5c..b19e9f1c4 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -280,7 +280,7 @@
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
diff --git a/os/xalloc.c b/os/xalloc.c
index 5677896dc..6740e89cb 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -185,6 +185,7 @@ extern Bool Must_have_memory;
defined(__sparc64__) || \
defined(__s390x__) || \
defined(__amd64__) || defined(amd64) || \
+ defined(__powerpc64__) || \
(defined(sgi) && _MIPS_SZLONG == 64))
#define MAGIC 0x1404196414071968
#define MAGIC_FREE 0x1506196615061966