diff options
| author | riz <riz@pkgsrc.org> | 2005-04-23 20:37:18 +0000 |
|---|---|---|
| committer | riz <riz@pkgsrc.org> | 2005-04-23 20:37:18 +0000 |
| commit | 3af222286d520c43aef7bbaed746f606254f6a04 (patch) | |
| tree | 9a100d9f9750f4264674b84302b4168c7cfa2b3b | |
| parent | 320cc0a4dcbf19f17be5089779a7f2cde2d1e688 (diff) | |
| download | pkgsrc-3af222286d520c43aef7bbaed746f606254f6a04.tar.gz | |
Adapt gcc asm constraints to work with gcc > 3. From a patch posted
on port-i386 by Kailash Sethuraman, with whitespace fix by me.
Fixes PR#25760 - Approved by jmcneill.
| -rw-r--r-- | sysutils/toshutils/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/toshutils/patches/patch-an | 14 | ||||
| -rw-r--r-- | sysutils/toshutils/patches/patch-ao | 43 |
3 files changed, 60 insertions, 1 deletions
diff --git a/sysutils/toshutils/distinfo b/sysutils/toshutils/distinfo index 5fc46c9dcf7..72e2f562d2c 100644 --- a/sysutils/toshutils/distinfo +++ b/sysutils/toshutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:40:58 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/04/23 20:37:18 riz Exp $ SHA1 (toshutils-991217.tar.gz) = b4eaf35fed37890c08f60999a2143f023cf632c1 RMD160 (toshutils-991217.tar.gz) = ea81ea88f53a4c0ed960868fc0604f9f82aeb836 @@ -16,3 +16,5 @@ SHA1 (patch-aj) = 305bbffb95e1fd50fcb73a2fe9a0c1452815a284 SHA1 (patch-ak) = c9ede3de555ab14c8a0702a80e904547f31da386 SHA1 (patch-al) = f2a06cf56e11a4ebb95a6d7ebda4b1c15dd0733d SHA1 (patch-am) = 43bba59c837c951e0b71c80365cf620ff3e05419 +SHA1 (patch-an) = 4d682ceb01d89ae676ba2fd1b342a50979c8694e +SHA1 (patch-ao) = ce863073a18463643a8c02b1d81efa3e8c31d805 diff --git a/sysutils/toshutils/patches/patch-an b/sysutils/toshutils/patches/patch-an new file mode 100644 index 00000000000..c72c038a700 --- /dev/null +++ b/sysutils/toshutils/patches/patch-an @@ -0,0 +1,14 @@ +$NetBSD: patch-an,v 1.1 2005/04/23 20:37:18 riz Exp $ +--- src/hci.c.orig 2005-04-14 10:44:42.000000000 -0700 ++++ src/hci.c 2005-04-14 11:10:30.000000000 -0700 +@@ -115,8 +115,8 @@ + ax = 0x0000; + } else { + asm ("inb $0xb2,%%al\n" \ +- :"=ax" (ax), "=bx" (bx), "=cx" (cx), "=dx" (dx) \ +- :"ax" (ax), "bx" (bx), "cx" (cx), "dx" (dx) \ ++ :"=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \ ++ :"a" (ax), "b" (bx), "c" (cx), "d" (dx) \ + : "memory" ); + } + diff --git a/sysutils/toshutils/patches/patch-ao b/sysutils/toshutils/patches/patch-ao new file mode 100644 index 00000000000..2a54606834c --- /dev/null +++ b/sysutils/toshutils/patches/patch-ao @@ -0,0 +1,43 @@ +$NetBSD: patch-ao,v 1.1 2005/04/23 20:37:18 riz Exp $ +--- src/sci.c.orig 1999-12-17 05:07:03.000000000 -0800 ++++ src/sci.c 2005-04-14 11:25:05.000000000 -0700 +@@ -98,7 +98,7 @@ + "popl %%ecx\n\t" \ + "popl %%ebx\n\t" \ + "popl %%eax\n" \ +- :"=dx" (dx), "=ah" (ah) : : "memory" ); ++ :"=d" (dx), "=a" (ah) : : "memory" ); + + *version = (int) dx; + +@@ -149,7 +149,7 @@ + "popl %%ecx\n\t" \ + "popl %%ebx\n\t" \ + "popl %%eax\n" \ +- :"=ah" (ah) : : "memory" ); ++ :"=a" (ah) : : "memory" ); + + return (int) (ah & 0xff); + } +@@ -173,8 +173,8 @@ + "inb $0xb2,%%al\n\t" \ + "popl %%edi\n\t" \ + "popl %%esi\n" \ +- :"=ax" (ax), "=bx" (bx), "=cx" (cx), "=dx" (dx) \ +- :"bx" (bx), "cx" (cx) \ ++ :"=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \ ++ :"b" (bx), "c" (cx) \ + : "memory" ); + + reg->attribute = (ax & 0xff); +@@ -205,8 +205,8 @@ + "inb $0xb2,%%al\n\t" \ + "popl %%edi\n\t" \ + "popl %%esi\n" \ +- :"=ax" (ax) \ +- :"bx" (bx), "cx" (cx), "dx" (dx) \ ++ :"=a" (ax) \ ++ :"b" (bx), "c" (cx), "d" (dx) \ + : "memory" ); + + reg->attribute = (ax & 0xff); |