1 files changed, 61 insertions, 49 deletions
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index 402c4d444a9..57e5fbc4b4b 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,71 +1,83 @@
-$NetBSD: patch-aa,v 1.7 2004/12/22 21:07:01 skrll Exp $
+$NetBSD: patch-aa,v 1.8 2008/11/01 05:15:42 obache Exp $
 
---- Makefile.orig	2004-10-30 18:32:50.000000000 +0100
-+++ Makefile
-@@ -3,28 +3,30 @@
- # Note: -O2 is sometimes broken in GCC when setjump/longjump is being
- # used. Try -O2 only with released simulators.
+--- makefile.orig	2008-06-06 06:00:46.000000000 +0000
++++ makefile
+@@ -1,32 +1,36 @@
+ #
+ # CC Command
  #
 -ifeq ($(WIN32),)
 +#ifeq ($(WIN32),)
- #Unix Environments
--ifeq ($(OSTYPE),solaris)
--OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
--else
--OS_CCDEFS = -D_GNU_SOURCE
--endif
--CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
--ifeq ($(USE_NETWORK),)
--else
--NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
--endif
--else
-+#ifeq ($(OSTYPE),solaris)
-+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
-+#else
-+#OS_CCDEFS = -D_GNU_SOURCE
-+#endif
-+#CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
-+CC = gcc -O2 -g -lm -I . -DDONT_USE_PCAP_FINDALLDEVS -DNEED_PCAP_SENDPACKET
-+#ifeq ($(USE_NETWORK),)
-+#else
-+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+NETWORK_OPT = -DUSE_NETWORK -lpcap
-+#endif
-+#else
- #Win32 Environments
--LDFLAGS = -lm -lwsock32
--CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
--EXE = .exe
--ifeq ($(USE_NETWORK),)
+   #Unix Environments
+-  ifneq (,$(findstring solaris,$(OSTYPE)))
+-    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
+-  else
+-    ifneq (,$(findstring darwin,$(OSTYPE)))
+-      OS_CCDEFS = -D_GNU_SOURCE
+-    else
+-      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+-    endif
+-  endif
+-  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
+-  ifeq ($(USE_NETWORK),)
+-  else
+-    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
+-  endif
 -else
--NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
--endif
+-  #Win32 Environments
+-  LDFLAGS = -lm -lwsock32 -lwinmm
+-  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
+-  EXE = .exe
+-  ifeq ($(USE_NETWORK),)
+-  else
+-    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
+-  endif
 -endif
-+#LDFLAGS = -lm -lwsock32
-+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
-+#EXE = .exe
-+#ifeq ($(USE_NETWORK),)
++#  ifneq (,$(findstring solaris,$(OSTYPE)))
++#    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
++#  else
++#    ifneq (,$(findstring darwin,$(OSTYPE)))
++#      OS_CCDEFS = -D_GNU_SOURCE
++#    else
++#      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
++#    endif
++#  endif
++#  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
++CC ?= gcc
++CC := ${CC} -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
++#
++#  ifeq ($(USE_NETWORK),)
++#  else
++#    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
++     NETWORK_OPT = -DUSE_NETWORK -lpcap
++#  endif
 +#else
-+#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
++#  #Win32 Environments
++#  LDFLAGS = -lm -lwsock32 -lwinmm
++#  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
++#  EXE = .exe
++#  ifeq ($(USE_NETWORK),)
++#  else
++#    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
++#  endif
 +#endif
-+#endif
- 
  
  #
-@@ -252,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} 
+ # Common Libraries
+@@ -259,11 +263,11 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp
  all : ${ALL}
  
  clean :
 -ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
- 	${RM} ${ALL}
+-	${RM} ${BIN}*
 -else
 -	if exist BIN\*.exe del /q BIN\*.exe
 -endif
++#ifeq ($(WIN32),)
++	rm ${BIN}*
 +#else
 +#	if exist BIN\*.exe del /q BIN\*.exe
 +#endif
+ 
  #
  # Individual builds
- #