forgot to cvs add these patches. noted by thomas klausner and the

weekly-pkgsrc check.  these eliminate the use of regparm on non-i386
systems.

3 files changed, 73 insertions, 1 deletions

diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index c2a958a670c..c8d7e00faf9 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/05/11 09:21:37 wiz Exp $
+$NetBSD: distinfo,v 1.5 2001/05/11 11:17:39 dmcmahill Exp $
 
 SHA1 (hercules-2.11.tar.gz) = ec84388e29cfd070055afa5fc11a33c896f2333a
 Size (hercules-2.11.tar.gz) = 616554 bytes
@@ -15,3 +15,5 @@ SHA1 (patch-aj) = b4beda52ced42d6d58f02b24c0eaf56109eab092
 SHA1 (patch-ak) = b727b0fad00ee546854cfbc4342e4c759fe7b0d2
 SHA1 (patch-al) = 60d90ed9c1476b8fcf0a905a8316f3aec9108169
 SHA1 (patch-am) = 4626f39156ac2beccd9911f795aff6f9fe7b997b
+SHA1 (patch-an) = 3c36e9745316ef84caf60ba66b541b7cc3007377
+SHA1 (patch-ao) = 4d389c21d36ab44565f8e90f90dad8acff24e747
diff --git a/emulators/hercules/patches/patch-an b/emulators/hercules/patches/patch-an
new file mode 100644
index 00000000000..777dfa88dcc
--- /dev/null
+++ b/emulators/hercules/patches/patch-an
@@ -0,0 +1,54 @@
+$NetBSD: patch-an,v 1.1 2001/05/11 11:17:39 dmcmahill Exp $
+
+regparm is only for i386
+
+--- features.h.orig	Thu Feb  1 17:56:32 2001
++++ features.h	Tue May  8 18:47:14 2001
+@@ -71,6 +71,11 @@
+ #define ARCH_MODE	ARCH_370
+ 
++#ifdef __i386__
+ #define DEF_INST(_name) \
+ __attribute__ ((regparm(3))) void s370_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#else
++#define DEF_INST(_name) \
++void s370_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#endif
+ 
+ #define ARCH_DEP(_name) \
+@@ -130,6 +135,11 @@
+ #define ARCH_MODE	ARCH_390
+ 
++#ifdef __i386__
+ #define DEF_INST(_name) \
+ __attribute__ ((regparm(3))) void s390_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#else
++#define DEF_INST(_name) \
++void s390_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#endif
+ 
+ #define ARCH_DEP(_name) \
+@@ -212,6 +222,11 @@
+ #define SSGROUP_BIT	ASCE_G
+ 
++#ifdef __i386__
+ #define DEF_INST(_name) \
+ __attribute__ ((regparm(3))) void z900_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#else
++#define DEF_INST(_name) \
++void z900_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#endif
+ 
+ #define ARCH_DEP(_name) \
+@@ -268,6 +283,11 @@
+ #define SSGROUP_BIT	ASCE_G
+ 
++#ifdef __i386__
+ #define DEF_INST(_name) \
+ __attribute__ ((regparm(3))) void z964_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#else
++#define DEF_INST(_name) \
++void z964_ ## _name (BYTE inst[], int execflag, REGS *regs)
++#endif
+ 
+ #define ARCH_DEP(_name) \
diff --git a/emulators/hercules/patches/patch-ao b/emulators/hercules/patches/patch-ao
new file mode 100644
index 00000000000..688e7cbf57f
--- /dev/null
+++ b/emulators/hercules/patches/patch-ao
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 2001/05/11 11:17:40 dmcmahill Exp $
+
+regparm is only for i386
+
+--- opcode.h.orig	Sat Feb 10 08:46:27 2001
++++ opcode.h	Tue May  8 18:48:56 2001
+@@ -70,5 +70,9 @@
+ 
+ 
++#ifdef __i386__
+ typedef __attribute__ ((regparm(3))) void (*zz_func) (BYTE inst[], int execflag, REGS *regs);
++#else
++typedef void (*zz_func) (BYTE inst[], int execflag, REGS *regs);
++#endif
+ 
+ extern zz_func opcode_table[][GEN_MAXARCH];