diff options
| -rw-r--r-- | common/arch.h | 14 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdp.h | 7 | ||||
| -rw-r--r-- | xorg/X11R7.6/xorg-server-1.9.3.patch | 18 |
3 files changed, 29 insertions, 10 deletions
diff --git a/common/arch.h b/common/arch.h index 6ae3aa1d..8ebaa6ce 100644 --- a/common/arch.h +++ b/common/arch.h @@ -61,16 +61,16 @@ #endif #endif +#if defined(__powerpc64__) +# define NO_NEED_ALIGN +#endif + /* check if we need to align data */ #if !(defined(NEED_ALIGN) || defined(NO_NEED_ALIGN)) #if defined(__sparc__) || defined(__alpha__) || defined(__hppa__) || \ - defined(__AIX__) || defined(__PPC__) || defined(__mips__) || \ - defined(__ia64__) || defined(__ppc__) || defined(__arm__) -#define NEED_ALIGN -#elif defined(__x86__) || defined(__x86_64__) || \ - defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ - defined(__i386__) -#define NO_NEED_ALIGN + defined(__AIX__) || (defined(__PPC__) && !defined(__powerpc64__)) || defined(__mips__) || \ + defined(__ia64__) || (defined(__ppc__) && !defined(__powerpc64__)) || defined(__arm__) +# define NEED_ALIGN #else #warning unknown arch #endif diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h index bc34778b..322dbc7a 100644 --- a/xorg/X11R7.6/rdp/rdp.h +++ b/xorg/X11R7.6/rdp/rdp.h @@ -618,11 +618,12 @@ rdpXvInit(ScreenPtr pScreen); # error Unknown endianness in rdp.h #endif /* check if we need to align data */ -/* check if we need to align data */ -#if defined(__sparc__) || defined(__alpha__) || defined(__hppa__) || \ +#if defined(__powerpc64__) +# undef NEED_ALIGN +#elif defined(__sparc__) || defined(__alpha__) || defined(__hppa__) || \ defined(__AIX__) || defined(__PPC__) || defined(__mips__) || \ defined(__ia64__) || defined(__ppc__) || defined(__arm__) -#define NEED_ALIGN +# define NEED_ALIGN #endif /* parser state */ diff --git a/xorg/X11R7.6/xorg-server-1.9.3.patch b/xorg/X11R7.6/xorg-server-1.9.3.patch new file mode 100644 index 00000000..b7b3edae --- /dev/null +++ b/xorg/X11R7.6/xorg-server-1.9.3.patch @@ -0,0 +1,18 @@ +diff -ur a/include/servermd.h b/include/servermd.h +--- a/include/servermd.h ++++ b/include/servermd.h +@@ -92,7 +92,13 @@ + /* byte boundries */ + #endif /* hpux || __hppa__ */ + +-#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) ++#if defined(__powerpc64__) && !defined(__BIG_ENDIAN__) ++ ++# define IMAGE_BYTE_ORDER LSBFirst ++# define BITMAP_BIT_ORDER LSBFirst ++# define GLYPHPADBYTES 4 ++ ++#elif defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) + + #define IMAGE_BYTE_ORDER MSBFirst + #define BITMAP_BIT_ORDER MSBFirst |