[src/netbsd-1-4]: src Apply patch (requested by toddpw):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9cb513def8b2
branches:  netbsd-1-4
changeset: 470441:9cb513def8b2
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 29 23:38:26 2000 +0000

description:
Apply patch (requested by toddpw):
  Work around problems with gcc optimization on vax.

diffstat:

 gnu/usr.bin/binutils/common/Makefile |   9 ++++++++-
 gnu/usr.bin/gdb/Makefile             |   9 ++++++++-
 gnu/usr.bin/groff/grotty/Makefile    |   7 ++++++-
 usr.sbin/ipf/ipmon/Makefile          |  13 ++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diffs (84 lines):

diff -r 9111bd910176 -r 9cb513def8b2 gnu/usr.bin/binutils/common/Makefile
--- a/gnu/usr.bin/binutils/common/Makefile      Tue Feb 29 23:31:50 2000 +0000
+++ b/gnu/usr.bin/binutils/common/Makefile      Tue Feb 29 23:38:26 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 1999/02/13 02:54:24 lukem Exp $
+#      $NetBSD: Makefile,v 1.7.2.1 2000/02/29 23:38:26 he Exp $
 
 LIB=           common
 
@@ -15,3 +15,10 @@
 libinstall::
 
 .include <bsd.lib.mk>
+
+# Nasty hack to avoid internal gcc errors for 1.4.1
+#
+.if ${MACHINE} == "vax"
+ieee.o:
+        ${CC} ${CPPFLAGS} -c ${.IMPSRC}
+.endif
diff -r 9111bd910176 -r 9cb513def8b2 gnu/usr.bin/gdb/Makefile
--- a/gnu/usr.bin/gdb/Makefile  Tue Feb 29 23:31:50 2000 +0000
+++ b/gnu/usr.bin/gdb/Makefile  Tue Feb 29 23:38:26 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 1999/03/17 00:46:35 thorpej Exp $
+#      $NetBSD: Makefile,v 1.30.2.1 2000/02/29 23:40:02 he Exp $
 
 # for OBJECT_FMT
 .include <bsd.own.mk>
@@ -112,3 +112,10 @@
 tm.h: ${DIST}/gdb/config/${ARCHSUBDIR}/tm-nbsd.h
        @-rm -f $@
        cp $> $@
+
+# Nasty hack to avoid internal gcc errors for 1.4.1
+#
+.if ${MACHINE} == "vax"
+infrun.o:
+        ${CC} ${CPPFLAGS} -c ${.IMPSRC}
+.endif
diff -r 9111bd910176 -r 9cb513def8b2 gnu/usr.bin/groff/grotty/Makefile
--- a/gnu/usr.bin/groff/grotty/Makefile Tue Feb 29 23:31:50 2000 +0000
+++ b/gnu/usr.bin/groff/grotty/Makefile Tue Feb 29 23:38:26 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 1997/10/25 10:11:53 lukem Exp $
+#      $NetBSD: Makefile,v 1.9.2.1 2000/02/29 23:40:26 he Exp $
 
 PROG=          grotty
 SRCS=          tty.cc
@@ -6,6 +6,11 @@
 LDADD+=                $(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=                $(LIBDRIVER) $(LIBGROFF) $(LIBM)
 
+# 1.4.1 vax groff (breaks on tail and rwhod manpages without this). (tty.cc)
+.if (${MACHINE_ARCH} == "vax" && ${CXXFLAGS} == "-O")
+CXXFLAGS=
+.endif
+
 .include "../../Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff -r 9111bd910176 -r 9cb513def8b2 usr.sbin/ipf/ipmon/Makefile
--- a/usr.sbin/ipf/ipmon/Makefile       Tue Feb 29 23:31:50 2000 +0000
+++ b/usr.sbin/ipf/ipmon/Makefile       Tue Feb 29 23:38:26 2000 +0000
@@ -1,7 +1,18 @@
-#      $NetBSD: Makefile,v 1.13.2.1 1999/12/20 21:07:07 he Exp $
+#      $NetBSD: Makefile,v 1.13.2.2 2000/02/29 23:41:11 he Exp $
 
 PROG=  ipmon
 MAN=   ipmon.8
 CPPFLAGS+=-DLOGFAC=LOG_LOCAL0
+.if (${MACHINE_ARCH} == "vax")
+# work around internal compiler error in ipmon.c:main() with -O
+CFLAGS=-O0
+
+# Nasty hack to avoid internal gcc errors for 1.4.1
+#
+.if ${MACHINE} == "vax"
+ipmon.o:
+        ${CC} ${CPPFLAGS} -c ${.IMPSRC}
+.endif
+.endif
 
 .include <bsd.prog.mk>