[pkgsrc/trunk]: pkgsrc/sysutils/toshutils Adapt gcc asm constraints to work w...

[riz <riz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91ce478a76cb
branches:  trunk
changeset: 492961:91ce478a76cb
user:      riz <riz%pkgsrc.org@localhost>
date:      Sat Apr 23 20:37:18 2005 +0000

description:
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.

diffstat:

 sysutils/toshutils/distinfo         |   4 ++-
 sysutils/toshutils/patches/patch-an |  14 ++++++++++++
 sysutils/toshutils/patches/patch-ao |  43 +++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletions(-)

diffs (80 lines):

diff -r 972cd28dd41e -r 91ce478a76cb sysutils/toshutils/distinfo
--- a/sysutils/toshutils/distinfo       Sat Apr 23 20:19:14 2005 +0000
+++ b/sysutils/toshutils/distinfo       Sat Apr 23 20:37:18 2005 +0000
@@ -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-ak) = c9ede3de555ab14c8a0702a80e904547f31da386
 SHA1 (patch-al) = f2a06cf56e11a4ebb95a6d7ebda4b1c15dd0733d
 SHA1 (patch-am) = 43bba59c837c951e0b71c80365cf620ff3e05419
+SHA1 (patch-an) = 4d682ceb01d89ae676ba2fd1b342a50979c8694e
+SHA1 (patch-ao) = ce863073a18463643a8c02b1d81efa3e8c31d805
diff -r 972cd28dd41e -r 91ce478a76cb sysutils/toshutils/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/toshutils/patches/patch-an       Sat Apr 23 20:37:18 2005 +0000
@@ -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 -r 972cd28dd41e -r 91ce478a76cb sysutils/toshutils/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/toshutils/patches/patch-ao       Sat Apr 23 20:37:18 2005 +0000
@@ -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);