[PATCH 1/1] xfree86: Use the correct __i386__ inline asm fallbacks in compiler.h

Jeremy Huddleston Sequoia jeremyhu at apple.com
Tue Oct 20 10:52:42 PDT 2015


../../../../hw/xfree86/common/compiler.h:975:26: error: invalid operand in inline asm: 'out${0:B} ($1)' [Inline Assembly Issue]
    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
                         ^
../../../../hw/xfree86/common/compiler.h:975:26: error: unknown use of instruction mnemonic without a size suffix [Inline Assembly Issue]
<inline asm>:1:2: note: instantiated into assembly here
        out (%dx)
        ^
2 errors generated.

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
CC: Adam Jackson <ajax at nwnk.net>
---
 hw/xfree86/common/compiler.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 1653574..1f48f69 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -286,7 +286,7 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
 #include <machine/pio.h>
 #endif                          /* __NetBSD__ */
 
-#elif defined(__amd64__)
+#elif defined(__i386__) || defined(__amd64__)
 
 #include <inttypes.h>
 
@@ -967,7 +967,7 @@ inl(unsigned PORT_SIZE port)
 
 #endif                          /* NDS32_MMIO_SWAP */
 
-#elif defined(__i386__) || defined(__ia64__)
+#elif defined(__ia64__)
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
-- 
2.6.2



More information about the xorg-devel mailing list