Restore part of patch-sa to get correct syntax for in/out.

2 files changed, 55 insertions, 1 deletions

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 8c50436f916..63df5061ef5 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.50 2013/05/19 01:30:24 obache Exp $
+$NetBSD: distinfo,v 1.51 2013/05/21 18:38:03 joerg Exp $
 
 SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
 RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
 Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
 SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784
+SHA1 (patch-hw_xfree86_common_compiler.h) = 88de747715b80b22f448869ab32dce1641bcb6db
 SHA1 (patch-hw_xfree86_os-support_xf86__OSlib.h) = 7c2760509610b44915da077b22899bef9c338cc1
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h
new file mode 100644
index 00000000000..b71e4453dd9
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h
@@ -0,0 +1,53 @@
+$NetBSD: patch-hw_xfree86_common_compiler.h,v 1.1 2013/05/21 18:38:03 joerg Exp $
+
+--- hw/xfree86/common/compiler.h.orig	2013-05-21 17:33:57.000000000 +0000
++++ hw/xfree86/common/compiler.h
+@@ -1392,26 +1392,26 @@ inl(unsigned short port)
+ static __inline__ void
+ outb(unsigned short port, unsigned char val)
+ {
+-    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outb %0, %1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outw(unsigned short port, unsigned short val)
+ {
+-    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outw %0, %1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outl(unsigned short port, unsigned int val)
+ {
+-    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outl %0, %1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ unsigned int
+ inb(unsigned short port)
+ {
+     unsigned char ret;
+-    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inb %1, %0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1420,7 +1420,7 @@ static __inline__ unsigned int
+ inw(unsigned short port)
+ {
+     unsigned short ret;
+-    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inw %1, %0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1429,7 +1429,7 @@ static __inline__ unsigned int
+ inl(unsigned short port)
+ {
+     unsigned int ret;
+-    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inl %1, %0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }