diff options
| author | joerg <joerg> | 2012-05-04 16:40:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-05-04 16:40:01 +0000 |
| commit | 382fb363807251004e41dc7cc1f0246283bf732a (patch) | |
| tree | 102f3d4e1951a94efea105c5f4bb96c80d87f2e3 /x11/modular-xorg-server | |
| parent | 96d8e3b766e9e10e3847c1264a72fc7cf732ea96 (diff) | |
| download | pkgsrc-382fb363807251004e41dc7cc1f0246283bf732a.tar.gz | |
Just use AT&T assembler syntax all the time.
Diffstat (limited to 'x11/modular-xorg-server')
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 4 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-sa | 55 |
2 files changed, 54 insertions, 5 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 512b0e31b08..b76cea0b58f 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2012/03/13 14:13:52 fhajny Exp $ +$NetBSD: distinfo,v 1.46 2012/05/04 16:40:01 joerg Exp $ SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a @@ -26,7 +26,7 @@ SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2 SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784 -SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87 +SHA1 (patch-sa) = 349bad3f5f7e6bc3b7d37ab37fb6d2a0e6f4d7f0 SHA1 (patch-sb) = 48c22a62b30c6bc4d5786624bc264fee30a9bb81 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0 SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881 diff --git a/x11/modular-xorg-server/patches/patch-sa b/x11/modular-xorg-server/patches/patch-sa index 1d58218cc88..058ef636d79 100644 --- a/x11/modular-xorg-server/patches/patch-sa +++ b/x11/modular-xorg-server/patches/patch-sa @@ -1,8 +1,8 @@ -$NetBSD: patch-sa,v 1.3 2009/09/20 12:04:01 sno Exp $ +$NetBSD: patch-sa,v 1.4 2012/05/04 16:40:01 joerg Exp $ --- hw/xfree86/common/compiler.h.orig 2009-07-07 19:48:58.000000000 +0200 +++ hw/xfree86/common/compiler.h 2009-09-20 11:51:51.000000000 +0200 -@@ -465,7 +465,7 @@ +@@ -465,7 +465,7 @@ extern unsigned int inb(unsigned long po extern unsigned int inw(unsigned long port); extern unsigned int inl(unsigned long port); @@ -11,7 +11,7 @@ $NetBSD: patch-sa,v 1.3 2009/09/20 12:04:01 sno Exp $ # include <inttypes.h> -@@ -531,7 +531,7 @@ +@@ -531,7 +531,7 @@ inl(unsigned short port) return ret; } @@ -20,3 +20,52 @@ $NetBSD: patch-sa,v 1.3 2009/09/20 12:04:01 sno Exp $ # ifndef ASI_PL # define ASI_PL 0x88 +@@ -1390,26 +1390,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)" : ++ __asm__ __volatile__("inb %1,%0" : + "=a" (ret) : + "d" (port)); + return ret; +@@ -1419,7 +1419,7 @@ static __inline__ unsigned int + inw(unsigned short port) + { + unsigned short ret; +- __asm__ __volatile__("in%W0 (%1)" : ++ __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)" : ++ __asm__ __volatile__("inl %1,%0" : + "=a" (ret) : + "d" (port)); + return ret; |