xserver: Branch 'master' - 3 commits

[Keith Packard]

 configure.ac                  |    1 +
 hw/xfree86/int10/stub.c       |    2 +-
 hw/xfree86/int10/xf86x86emu.c |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b92a9289fef4831e9af69e5f6f64b5454f550559
Author: Thierry Reding <thierry.reding at gmail.com>
Date:   Wed Feb 12 17:11:40 2014 +0100

    xfree86: int10: Fix build on ARM
    
    Commit 7353ec7cb6fc235b03e59e35425201429c83ee72 "xfree86: Switch int10
    code to stdint types" uses designated initializers to setup the fields
    of the X86EMU_pioFuncs.
    
    This breaks compilation on ARM, since out{b,w,l}() are redefined using
    the preprocessor and therefore cause the compiler to complain about
    non-existent fields being assigned to.
    
    It seems like the compiler.h header that contains these redefinitions
    isn't actually needed in xf86x86emu.c, so the easiest "fix" is to not
    include it.
    
    Signed-off-by: Thierry Reding <treding at nvidia.com>
    Reviewed-by: Rob Clark <robdclark at gmail.com>

diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index b9a4d36..4b0a130 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -9,7 +9,6 @@
 
 #include <x86emu.h>
 #include "xf86.h"
-#include "compiler.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE
commit 774fea38c48671ed44e54278f0280bae04822491
Author: Rob Clark <robdclark at gmail.com>
Date:   Thu Apr 3 15:35:53 2014 -0400

    int10: fix build error
    
    Fixes:
    
      stub.c:66:1: error: conflicting types for 'xf86int10Addr'
      In file included from stub.c:14:0:
      xf86int10.h:72:53: note: previous declaration of 'xf86int10Addr' was here
    
    Signed-off-by: Rob Clark <robdclark at gmail.com>

diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index 40e0ba7..4bbcdde 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -63,7 +63,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt)
 }
 
 void *
-xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
+xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr)
 {
     return 0;
 }
commit b241934238feedcb86c113fe3beb69a7470de02d
Author: Rob Clark <robdclark at gmail.com>
Date:   Thu Apr 3 14:54:02 2014 -0400

    default to stub int10 implementation on arm
    
    There should be no reason to need a real int10 implementation on arm,
    and switching to stub is an easy way to fix:
    
      xf86x86emu.c: In function 'xf86Int10ExecSetup':
      xf86x86emu.c:56:9: error: unknown field 'xf_outb' specified in initializer
      xf86x86emu.c:57:9: error: unknown field 'xf_outw' specified in initializer
      xf86x86emu.c:58:9: error: unknown field 'xf_outl' specified in initializer
    
    which is caused by the following in compiler.h:
    
      #define outb xf_outb
      #define outw xf_outw
      #define outl xf_outl
    
    Signed-off-by: Rob Clark <robdclark at gmail.com>
    Acked-by: Daniel Stone <daniels at collabora.com>

diff --git a/configure.ac b/configure.ac
index 0c8b516..e5387bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,6 +325,7 @@ case $host_cpu in
 	;;
   arm*)
 	ARM_VIDEO=yes
+	DEFAULT_INT10="stub"
 	;;
   i*86)
 	I386_VIDEO=yes