From b0303126d9e5b51290d116e75a57b4f94e5fc4d7 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 28 Oct 2013 23:48:30 +0000
Subject: Remove -fno-defer-pop -fcaller-saves -fno-inline, which are
 workarounds for various ancient GCC versions.

---
 lang/gforth/distinfo                         |  5 +++--
 lang/gforth/patches/patch-aa                 | 11 ++++++++++-
 lang/gforth/patches/patch-engine_Makefile.in | 13 +++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 lang/gforth/patches/patch-engine_Makefile.in

(limited to 'lang')

diff --git a/lang/gforth/distinfo b/lang/gforth/distinfo
index 0cb4701ed9b..6dcccdf264e 100644
--- a/lang/gforth/distinfo
+++ b/lang/gforth/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2013/06/13 21:43:26 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/10/28 23:48:30 joerg Exp $
 
 SHA1 (gforth-0.7.0.tar.gz) = 5bb357268cba683f2a8c63d2a4bcab8f41cb0086
 RMD160 (gforth-0.7.0.tar.gz) = df0cef8cff25eddf670315c5497fc5634226968c
 Size (gforth-0.7.0.tar.gz) = 2277918 bytes
-SHA1 (patch-aa) = 88811b03619a597d202105c89b659576a9fd34b2
+SHA1 (patch-aa) = 405a78dab65952f599b3f201053ae73c25da4576
 SHA1 (patch-ae) = 5ed4c1b54d6c2af55580183cdc9d66b70fffa955
 SHA1 (patch-configure) = e6cf2ba54f5a6492943220a2a8b12e887dcfa527
 SHA1 (patch-configure.in) = 4886054414beda7de68323143eecb03ef20c10f9
+SHA1 (patch-engine_Makefile.in) = acc3c38ae6c1c0431b22a05828fdcdb33487a182
diff --git a/lang/gforth/patches/patch-aa b/lang/gforth/patches/patch-aa
index 1eb41156d23..39ced7c5eeb 100644
--- a/lang/gforth/patches/patch-aa
+++ b/lang/gforth/patches/patch-aa
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.4 2009/08/14 22:52:21 asau Exp $
+$NetBSD: patch-aa,v 1.5 2013/10/28 23:48:30 joerg Exp $
 
 Don't generate and install Emacs byte code file.
 
 --- Makefile.in.orig	2008-11-01 20:22:27.000000000 +0300
 +++ Makefile.in	2009-08-15 02:04:09.000000000 +0400
+@@ -104,7 +104,7 @@ TEXI2HTML = texi2html
+ XCFLAGS	= @CFLAGS@
+ XDEFINES = @DEFS@
+ SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES) #-DNDEBUG #turn off assertions
+-ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
++ENGINE_FLAGS = @ENGINE_FLAGS@
+ DEBUGFLAG = @DEBUGFLAG@
+ CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'
+ CPPFLAGS = @CPPFLAGS@
 @@ -430,7 +430,7 @@
  
  ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
diff --git a/lang/gforth/patches/patch-engine_Makefile.in b/lang/gforth/patches/patch-engine_Makefile.in
new file mode 100644
index 00000000000..c5717f80018
--- /dev/null
+++ b/lang/gforth/patches/patch-engine_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-engine_Makefile.in,v 1.1 2013/10/28 23:48:30 joerg Exp $
+
+--- engine/Makefile.in.orig	2013-10-18 15:51:52.000000000 +0000
++++ engine/Makefile.in
+@@ -89,7 +89,7 @@ XCFLAGS	= @CFLAGS@
+ XDEFINES = @DEFS@
+ SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES)
+ #use -fno-inline to avoid register problems with asinh, atanh on gcc-3.3 on 386
+-ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves -fno-inline
++ENGINE_FLAGS = @ENGINE_FLAGS@
+ DEBUGFLAG = @DEBUGFLAG@
+ CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/../arch/$(machine) -I. -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' $(LTDLINCL)
+ CFLAGS2	= $(DEBUGFLAG) -I$(srcdir)/../arch/$(machine) -I. -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' $(LTDLINCL)
-- 
cgit v1.2.3