From aa405203151184d970aa26592f2974b101b4da47 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 2 Apr 2005 22:23:53 +0000
Subject: Make this build on NetBSD/1.6.x-i386.

The source code use some global register variables, and gcc 2.95
reports errors because the header files contains "static inline"
function definitions before the global register variables are
defined. Reordering the includes is too much work, so just fall
back to normal (non-register) globals when using gcc2.
---
 emulators/generator/distinfo         |  4 +++-
 emulators/generator/patches/patch-aa | 13 +++++++++++++
 emulators/generator/patches/patch-ab | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 emulators/generator/patches/patch-aa
 create mode 100644 emulators/generator/patches/patch-ab

diff --git a/emulators/generator/distinfo b/emulators/generator/distinfo
index 2cde6f637b5..af60595b3bc 100644
--- a/emulators/generator/distinfo
+++ b/emulators/generator/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/04/02 22:23:53 kristerw Exp $
 
 SHA1 (generator-0.35.tar.gz) = a61138579efd97028d3a69c54c3c6fcd0a3d74ab
 RMD160 (generator-0.35.tar.gz) = 6b448018b8ed0fd9755ddb850f48892304d12e78
 Size (generator-0.35.tar.gz) = 469541 bytes
+SHA1 (patch-aa) = 5b971a07345bbd8e3d86284127829df5f4f5a541
+SHA1 (patch-ab) = 487620ee83fc17119ad6b8ab3e9a19a1401a5c02
 SHA1 (patch-ac) = 7467437c39f7df56a261a330d8f021c0d9c0381b
 SHA1 (patch-ae) = 4e689421fe66aa7f635191e9f0100cd98daf8a76
 SHA1 (patch-af) = ef1c72b6da1ae93209a13b6836d5a85f66ffa51c
diff --git a/emulators/generator/patches/patch-aa b/emulators/generator/patches/patch-aa
new file mode 100644
index 00000000000..50d9b2de140
--- /dev/null
+++ b/emulators/generator/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2005/04/02 22:23:53 kristerw Exp $
+
+--- hdr/registers.h.orig	Sat Apr  2 23:59:51 2005
++++ hdr/registers.h	Sun Apr  3 00:05:50 2005
+@@ -13,7 +13,7 @@
+        register uint32 *reg68k_regs asm ("6");
+        register t_sr reg68k_sr asm ("7");
+ #  else
+-#    ifdef PROCESSOR_INTEL
++#    if defined (PROCESSOR_INTEL) && (__GNUC__ > 2)
+          register uint32 reg68k_pc asm ("%ebx");
+          register uint32 *reg68k_regs asm ("%edi");
+          register t_sr reg68k_sr asm ("%esi");
diff --git a/emulators/generator/patches/patch-ab b/emulators/generator/patches/patch-ab
new file mode 100644
index 00000000000..fdb745646bd
--- /dev/null
+++ b/emulators/generator/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.3 2005/04/02 22:23:53 kristerw Exp $
+
+--- main/reg68k.c.orig	Sun Apr  3 00:02:45 2005
++++ main/reg68k.c	Sun Apr  3 00:04:24 2005
+@@ -21,7 +21,8 @@
+ /*** global variables ***/
+ 
+ #if (!(defined(PROCESSOR_ARM) || defined(PROCESSOR_SPARC) \
+-       || defined(PROCESSOR_INTEL)))
++       || defined(PROCESSOR_INTEL))) \
++    || (defined(PROCESSOR_INTEL) && (__GNUC__ <= 2))
+ uint32 reg68k_pc;
+ uint32 *reg68k_regs;
+ t_sr reg68k_sr;
-- 
cgit v1.2.3