xserver: Branch 'master'

[Keith Packard]

Rebased ref, commits from common ancestor:
commit 19e5a13970ad9d440c0789395e94931429ef4fbb
Author: YunQiang Su <wzssyqa at gmail.com>
Date:   Sat Oct 12 13:22:35 2013 +0800

    Fix hw/xfree86/common/compiler.h for mips64
    
    Mark mips64 as 64bit
    Use long as PORT_SIZE
    
    Signed-off-by: YunQiang Su <wzssyqa at gmail.com>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 3a57186..fb95f58 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -103,6 +103,7 @@
 #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
       && !(defined(__alpha__) && defined(linux)) \
       && !(defined(__ia64__) && defined(linux)) \
+      && !(defined(__mips64) && defined(linux)) \
 
 extern _X_EXPORT void outb(unsigned short, unsigned char);
 extern _X_EXPORT void outw(unsigned short, unsigned short);
@@ -721,7 +722,7 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
 }
 
 #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#ifdef __arm32__
+#if defined(__arm32__) || defined(__mips64)
 #define PORT_SIZE long
 #else
 #define PORT_SIZE short