Fix a couple of additional ppc64 endianness / alignment issues

5 years ago · 485c758830
parent a097f24557
commit 485c758830
3 changed files with 26 additions and 5 deletions
--- a/common/arch.h
+++ b/common/arch.h
@ -41,10 +41,12 @@
 # endif
 #endif
 /* 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
 #endif

--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@ -513,11 +513,12 @@ rdpup_check_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv);
 #  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 */
--- a/xorg/X11R7.6/xorg-server-1.9.3.patch
+++ 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