summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmkhar Arasaratnam <omkhar@gentoo.org>2005-06-09 15:07:20 +0000
committerOmkhar Arasaratnam <omkhar@gentoo.org>2005-06-09 15:07:20 +0000
commitbfa73ff90da833623a066a6dad62562dc368998e (patch)
tree4ed0f3a4e90f4248232f343ce8dda1302d050786 /net-misc/vnc/files
parentStable on sparc (diff)
downloadgentoo-2-bfa73ff90da833623a066a6dad62562dc368998e.tar.gz
gentoo-2-bfa73ff90da833623a066a6dad62562dc368998e.tar.bz2
gentoo-2-bfa73ff90da833623a066a6dad62562dc368998e.zip
fix for eieio compile error with 2.6 headers and vnc server on ppc64
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-misc/vnc/files')
-rw-r--r--net-misc/vnc/files/xc.patch-eieio.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/net-misc/vnc/files/xc.patch-eieio.patch b/net-misc/vnc/files/xc.patch-eieio.patch
new file mode 100644
index 000000000000..cb6966e6c25d
--- /dev/null
+++ b/net-misc/vnc/files/xc.patch-eieio.patch
@@ -0,0 +1,17 @@
+--- xc.orig/programs/Xserver/hw/xfree86/common/compiler.h 2004-12-22 08:24:22.364106000 -0800
++++ xc/programs/Xserver/hw/xfree86/common/compiler.h 2004-12-22 08:26:39.869202576 -0800
+@@ -1076,7 +1076,12 @@
+
+ extern volatile unsigned char *ioBase;
+
+-# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
++#if defined(linux) && defined(__powerpc64__)
++# include <asm/memory.h>
++#endif /* defined(linux) && defined(__powerpc64__) */
++#ifndef eieio /* We deal with arch-specific eieio() routines above... */
++# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
++#endif /* eieio */
+
+ static __inline__ unsigned char
+ xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
+