Use normal optimiser settings, most of the manual overrides are the

default anyway.

5 files changed, 69 insertions, 10 deletions

diff --git a/emulators/gnuboy-sdl/distinfo b/emulators/gnuboy-sdl/distinfo
index f198141b08d..bbd6a0ec82c 100644
--- a/emulators/gnuboy-sdl/distinfo
+++ b/emulators/gnuboy-sdl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2013/10/28 23:45:28 joerg Exp $
 
 SHA1 (gnuboy-1.0.3.tar.gz) = 4c371445b6599c6636d08ba9c5de7bb9fbf78437
 RMD160 (gnuboy-1.0.3.tar.gz) = dfaf927fe2d4e03f39d83079b7dd3aa02c8983b9
 Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
 SHA1 (patch-aa) = 266f39882e2aa3cc3350a6080ecc6e8738c92160
+SHA1 (patch-configure) = 63b9ee2fe6e13f06354a3ef95bb3dedc41221990
diff --git a/emulators/gnuboy-sdl/patches/patch-configure b/emulators/gnuboy-sdl/patches/patch-configure
new file mode 100644
index 00000000000..5c19b9b0b99
--- /dev/null
+++ b/emulators/gnuboy-sdl/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2013/10/28 23:45:28 joerg Exp $
+
+--- configure.orig	2013-10-17 17:46:02.000000000 +0000
++++ configure
+@@ -3227,17 +3227,6 @@ case `uname -m` in
+ i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
+ esac
+ 
+-#case `$CC --version` in
+-#2.9*|3.*)
+-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
+- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
+- -fexpensive-optimizations -fforce-mem -fforce-addr"
+-#;;
+-#*)
+-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
+-#;;
+-#esac
+-
+ if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
+ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ LDFLAGS="$LDFLAGS -s"
diff --git a/emulators/gnuboy/distinfo b/emulators/gnuboy/distinfo
index 9f93f19e65e..1e851e82443 100644
--- a/emulators/gnuboy/distinfo
+++ b/emulators/gnuboy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.5 2013/10/28 23:45:28 joerg Exp $
 
 SHA1 (gnuboy-1.0.3.tar.gz) = 4c371445b6599c6636d08ba9c5de7bb9fbf78437
 RMD160 (gnuboy-1.0.3.tar.gz) = dfaf927fe2d4e03f39d83079b7dd3aa02c8983b9
 Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
 SHA1 (patch-aa) = d99a316e40d1249685204f23e66e3709cefc03e3
-SHA1 (patch-ab) = 0941dc1827ed998ee6ff66014239bb30f85124fa
-SHA1 (patch-ac) = 491bad4bd58f99fb72210cda5a6801f48d6c17d8
+SHA1 (patch-ab) = e3fe25086d105864f4d127c84bfe3f3234820927
+SHA1 (patch-ac) = 1c3851d5a65c377b25fae529d4505fdb9dd12729
 SHA1 (patch-ad) = cac88fded5d8422824faf57d8d32ab571a611fc1
diff --git a/emulators/gnuboy/patches/patch-ab b/emulators/gnuboy/patches/patch-ab
index 844be7893a9..27ae7afea92 100644
--- a/emulators/gnuboy/patches/patch-ab
+++ b/emulators/gnuboy/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2003/02/14 20:06:01 salo Exp $
+$NetBSD: patch-ab,v 1.3 2013/10/28 23:45:28 joerg Exp $
 
---- configure.in.orig	Sun Sep 23 21:09:31 2001
+--- configure.in.orig	2001-09-24 01:09:31.000000000 +0000
 +++ configure.in
 @@ -53,6 +53,11 @@ OpenBSD)
  SYS_DEFS=-DIS_OBSD
@@ -14,7 +14,25 @@ $NetBSD: patch-ab,v 1.2 2003/02/14 20:06:01 salo Exp $
  esac
  
  test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -251,6 +256,7 @@ AC_SUBST(SDL_LIBS)
+@@ -205,17 +210,6 @@ case `uname -m` in
+ i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
+ esac
+ 
+-#case `$CC --version` in
+-#2.9*|3.*)
+-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
+- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
+- -fexpensive-optimizations -fforce-mem -fforce-addr"
+-#;;
+-#*)
+-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
+-#;;
+-#esac
+-
+ if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
+ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ LDFLAGS="$LDFLAGS -s"
+@@ -251,6 +245,7 @@ AC_SUBST(SDL_LIBS)
  AC_SUBST(TARGETS)
  AC_SUBST(XINCS)
  AC_SUBST(XLIBS)
diff --git a/emulators/gnuboy/patches/patch-ac b/emulators/gnuboy/patches/patch-ac
index e39c78c42b3..cb160ef1234 100644
--- a/emulators/gnuboy/patches/patch-ac
+++ b/emulators/gnuboy/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2003/02/14 20:06:02 salo Exp $
+$NetBSD: patch-ac,v 1.3 2013/10/28 23:45:28 joerg Exp $
 
---- configure.orig	Tue Nov  6 03:03:13 2001
+--- configure.orig	2001-11-06 08:03:13.000000000 +0000
 +++ configure
 @@ -2499,6 +2499,59 @@ fi
  done
@@ -62,7 +62,25 @@ $NetBSD: patch-ac,v 1.2 2003/02/14 20:06:02 salo Exp $
  esac
  
  test "$SOUND" || SOUND=sys/dummy/nosound.o
-@@ -3679,6 +3732,7 @@ s,@SDL_LIBS@,$SDL_LIBS,;t t
+@@ -3227,17 +3280,6 @@ case `uname -m` in
+ i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
+ esac
+ 
+-#case `$CC --version` in
+-#2.9*|3.*)
+-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
+- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
+- -fexpensive-optimizations -fforce-mem -fforce-addr"
+-#;;
+-#*)
+-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
+-#;;
+-#esac
+-
+ if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
+ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ LDFLAGS="$LDFLAGS -s"
+@@ -3679,6 +3723,7 @@ s,@SDL_LIBS@,$SDL_LIBS,;t t
  s,@TARGETS@,$TARGETS,;t t
  s,@XINCS@,$XINCS,;t t
  s,@XLIBS@,$XLIBS,;t t