get hercules to compile on non-i386 by not using i386 assembly code

on those platforms.  Also remove a zillion warnings by
surrounding the i386 specific "regparm" attribute by
#ifdef __i386__

only minimal testing done on an alpha.  Hercules starts up and lets me
run "quit".

3 files changed, 26 insertions, 16 deletions

diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index c710908310f..b08f8b31af2 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/23 16:20:55 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/08 23:23:49 dmcmahill Exp $
 
 DISTNAME=		hercules-2.11
 PKGNAME=		${DISTNAME}nb1
@@ -14,6 +14,7 @@ DEPENDS+=		hercules-images-*:../../emulators/hercules-images
 
 USE_GMAKE=		yes
 MAKEFILE=		makefile
+MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH}
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hercules
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index a1be840f8e4..ea8d7c7e325 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:49:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/08 23:23:49 dmcmahill Exp $
 
 SHA1 (hercules-2.11.tar.gz) = ec84388e29cfd070055afa5fc11a33c896f2333a
 Size (hercules-2.11.tar.gz) = 616554 bytes
-SHA1 (patch-aa) = 18abe2558a76b68e14fa4253b1ea78b96360e2ab
+SHA1 (patch-aa) = 7d233b6ea857d97cc465270d704dbe547fe7ea83
 SHA1 (patch-ab) = ea2802d8752411e964ba150d3a54f64a40fc2e70
 SHA1 (patch-ac) = 59bfb3d67ab88a580a252245c3089d0952b4da56
 SHA1 (patch-ad) = dab44fa2ee216a8250c40675211126f61039abf3
@@ -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-aa b/emulators/hercules/patches/patch-aa
index aa4bf32fbfc..2157bba3a4c 100644
--- a/emulators/hercules/patches/patch-aa
+++ b/emulators/hercules/patches/patch-aa
@@ -1,36 +1,44 @@
-$NetBSD: patch-aa,v 1.4 2001/03/09 16:37:34 agc Exp $
+$NetBSD: patch-aa,v 1.5 2001/05/08 23:23:49 dmcmahill Exp $
 
 Set up compilation flags for NetBSD
 
---- makefile	2001/02/19 09:39:42	1.1
-+++ makefile	2001/02/19 09:40:37
-@@ -8,7 +8,7 @@
- #   besides /usr/bin. The $PREFIX (which defaults to nothing) can be
+--- makefile.orig	Sat Feb 10 22:21:58 2001
++++ makefile	Tue May  8 18:57:45 2001
+@@ -9,5 +9,5 @@
  #   overridden in the make command line, as in "PREFIX=/foo make install"
  #   (the directory is only used when installing).
 -DESTDIR  = $(PREFIX)/usr/bin
 +DESTDIR  = $(PREFIX)/bin
  
  # Standard flags for all architectures
- CFLAGS	 = -Wall -fomit-frame-pointer -DVERSION=$(VERSION) -DNO_BYTESWAP_H
-@@ -21,13 +21,13 @@
- 
+@@ -22,24 +22,26 @@
  # Handle host architecture if specified
  ifeq ($(HOST_ARCH),i386)
 -CFLAGS	 += -O3 -malign-double -DNO_ASM_BYTESWAP
+-endif
 +CFLAGS	 += -O3 -DNO_ASM_BYTESWAP
- endif
++else
  ifeq ($(HOST_ARCH),i586)
 -CFLAGS	 += -O3 -malign-double -march=pentium
+-endif
 +CFLAGS	 += -O3
- endif
++else
  ifeq ($(HOST_ARCH),i686)
 -CFLAGS	 += -O3 -malign-double -march=pentiumpro
+-endif
 +CFLAGS	 += -O3
- endif
++else
  ifeq ($(HOST_ARCH),alpha)
  CFLAGS	 += -O2 -DNO_ASM_BYTESWAP
-@@ -38,9 +38,9 @@
+-endif
+-ifeq ($(HOST_ARCH),other)
++else
+ CFLAGS	 += -O3 -DNO_ASM_BYTESWAP
+-endif
++endif  # alpha
++endif  # i686
++endif  # i586
++endif  # i386
  
  # Uncomment these lines for NetBSD, with either the unproven-pthreads
  #   or pth packages
@@ -42,4 +50,3 @@ Set up compilation flags for NetBSD
 +LFLAGS	 += -L${PREFIX}/lib -R${PREFIX}/pthreads/lib
  
  # Reverse the comments below to disable Compressed CKD Dasd support
- #CFLAGS  += -DNO_CCKD