xserver: Branch 'master'

[Keith Packard]

 include/servermd.h |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit adb7bc3386559dfee34b359dadcbb6796bc416e7
Author: Dinar Valeev <dvaleev at suse.com>
Date:   Mon Feb 24 11:36:54 2014 +0100

    arch: Fix image and bitmap byte order for ppc64le
    
    So far PPC was big endian for sure. For ppc64le this is no longer
    true.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/servermd.h b/include/servermd.h
index 081123b..e413314 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -114,8 +114,13 @@ SOFTWARE.
 
 #if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
 
-#define IMAGE_BYTE_ORDER        MSBFirst
-#define BITMAP_BIT_ORDER        MSBFirst
+#if defined(__LITTLE_ENDIAN__)
+#define IMAGE_BYTE_ORDER      LSBFirst
+#define BITMAP_BIT_ORDER      LSBFirst
+#else
+#define IMAGE_BYTE_ORDER      MSBFirst
+#define BITMAP_BIT_ORDER      MSBFirst
+#endif
 #define GLYPHPADBYTES           4
 
 #endif                          /* PowerPC */