Module Name: src
Committed By: mrg
Date: Wed Apr 15 19:13:47 UTC 2015
Modified Files:
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/external/bsd/libelf/lib: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/lib/libc/arch/aarch64: Makefile.inc
src/lib/libc/arch/sparc64: Makefile.inc
src/lib/libc/net: Makefile.inc
src/lib/libc/rpc: Makefile.inc
src/sbin/fsdb: Makefile
src/sys/arch/hp300/conf: Makefile.hp300
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/lib/libkern: Makefile.libkern
Log Message:
remove various HAVE_GCC=45 fragments.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libelf/lib/Makefile
cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.85 -r1.86 src/lib/libc/net/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.36 -r1.37 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/hp300/conf/Makefile.hp300
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.37 -r1.38 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.7 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.8
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.7 Fri Dec 5 04:42:36 2014
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/12/05 04:42:36 agc Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/15 19:13:46 mrg Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -27,8 +27,3 @@ INCS=verify.h
INCSDIR=/usr/include/netpgp
.include <bsd.lib.mk>
-
-.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "ia64"
-COPTS.bignum.c+= ${${ACTIVE_CC} == "gcc" :? -O1 :}
-.endif
-
Index: src/external/bsd/libelf/lib/Makefile
diff -u src/external/bsd/libelf/lib/Makefile:1.3 src/external/bsd/libelf/lib/Makefile:1.4
--- src/external/bsd/libelf/lib/Makefile:1.3 Thu Dec 27 08:06:28 2012
+++ src/external/bsd/libelf/lib/Makefile Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/12/27 08:06:28 martin Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/15 19:13:46 mrg Exp $
.include <bsd.init.mk>
@@ -49,10 +49,6 @@ LIBELF_GENSRCS= libelf_fsize.c libelf_ms
CLEANFILES+= ${LIBELF_GENSRCS}
CPPFLAGS+= -I${.CURDIR}
-.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "ia64"
-COPTS.libelf_extended.c+= ${${ACTIVE_CC} == "gcc" :? -O1 :}
-.endif
-
MAN= elf.3 \
elf_begin.3 \
elf_cntl.3 \
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.29 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.30
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.29 Thu Aug 21 08:52:23 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.29 2014/08/21 08:52:23 christos Exp $
+# $NetBSD: Makefile.inc,v 1.30 2015/04/15 19:13:46 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -193,8 +193,3 @@ DPSRCS+= ${_dst}
EXTRA_FAKEHEADERS= options.h libgcc_tm.h
.include "../../Makefile.hacks"
-
-# XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${LIBGCC_MACHINE_ARCH} == "m68k"
-COPTS._fixunsxfdi.c+= -O0
-.endif
Index: src/lib/libc/arch/aarch64/Makefile.inc
diff -u src/lib/libc/arch/aarch64/Makefile.inc:1.1 src/lib/libc/arch/aarch64/Makefile.inc:1.2
--- src/lib/libc/arch/aarch64/Makefile.inc:1.1 Sun Aug 10 05:47:36 2014
+++ src/lib/libc/arch/aarch64/Makefile.inc Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:36 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/04/15 19:13:46 mrg Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
#SRCS+= qdivrem.c
@@ -16,7 +16,3 @@ SRCS.softfloat= softfloat-wrapper.c
SRCS+= ${SRCS.softfloat}
CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
-I${.CURDIR}/softfloat/bits64
-
-#.if ${HAVE_GCC} == 45
-#COPTS.softfloat-wrapper.c+= -Wno-enum-compare
-#.endif
Index: src/lib/libc/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.19 src/lib/libc/arch/sparc64/Makefile.inc:1.20
--- src/lib/libc/arch/sparc64/Makefile.inc:1.19 Wed Mar 21 14:10:47 2012
+++ src/lib/libc/arch/sparc64/Makefile.inc Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2012/03/21 14:10:47 christos Exp $
+# $NetBSD: Makefile.inc,v 1.20 2015/04/15 19:13:46 mrg Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -20,8 +20,4 @@ SRCS+= ${SRCS.softfloat}
CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
-I${.CURDIR}/softfloat/bits64
-.if ${HAVE_GCC} == 45
-COPTS.softfloat-wrapper.c+= -Wno-enum-compare
-.endif
-
.endif
Index: src/lib/libc/net/Makefile.inc
diff -u src/lib/libc/net/Makefile.inc:1.85 src/lib/libc/net/Makefile.inc:1.86
--- src/lib/libc/net/Makefile.inc:1.85 Sat Oct 19 19:56:56 2013
+++ src/lib/libc/net/Makefile.inc Wed Apr 15 19:13:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.85 2013/10/19 19:56:56 christos Exp $
+# $NetBSD: Makefile.inc,v 1.86 2015/04/15 19:13:46 mrg Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -17,9 +17,6 @@ SRCS+= base64.c ethers.c gethnamaddr.c g
.if (${MKHESIOD} != "no")
SRCS+= hesiod.c
-.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "ia64"
-COPTS.hesiod.c+= ${${ACTIVE_CC} == "gcc" :? -O1 :}
-.endif
.endif
SRCS+= getaddrinfo.c getnameinfo.c
@@ -44,11 +41,6 @@ nslexer.c: nslexer.l nsparser.h
.include "${ARCHDIR}/net/Makefile.inc"
-.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "arm"
-COPTS.getaddrinfo.c+= ${${ACTIVE_CC} == "gcc" :? -fno-tree-ter :}
-COPTS.gethnamaddr.c+= ${${ACTIVE_CC} == "gcc" :? -fno-tree-ter :}
-.endif
-
MAN+= byteorder.3 ethers.3 gethostbyname.3 getifaddrs.3 \
getnetent.3 getprotoent.3 getpeereid.3 \
getservent.3 inet.3 inet_net.3 linkaddr.3 \
Index: src/lib/libc/rpc/Makefile.inc
diff -u src/lib/libc/rpc/Makefile.inc:1.21 src/lib/libc/rpc/Makefile.inc:1.22
--- src/lib/libc/rpc/Makefile.inc:1.21 Fri Aug 10 12:20:10 2012
+++ src/lib/libc/rpc/Makefile.inc Wed Apr 15 19:13:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2012/08/10 12:20:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.22 2015/04/15 19:13:47 mrg Exp $
# librpc sources
.PATH: ${.CURDIR}/rpc
@@ -167,8 +167,3 @@ MLINKS+= bindresvport.3 bindresvport_sa.
xdr.3 xdr_vector.3 \
xdr.3 xdr_void.3 \
xdr.3 xdr_wrapstring.3
-
-# XXX
-.if ${HAVE_GCC:U} == 45 || ${MACHINE} == "vax"
-COPTS.xdr_float.c+= -fno-strict-aliasing
-.endif
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.36 src/sbin/fsdb/Makefile:1.37
--- src/sbin/fsdb/Makefile:1.36 Sat Nov 9 21:39:27 2013
+++ src/sbin/fsdb/Makefile Wed Apr 15 19:13:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/11/09 21:39:27 christos Exp $
+# $NetBSD: Makefile,v 1.37 2015/04/15 19:13:47 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -40,8 +40,3 @@ COPTS.pass1.c+= -fno-tree-fre -fno-tree-
.endif
.include <bsd.prog.mk>
-
-# XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${MACHINE_ARCH} == "vax"
-COPTS.fsdb.c+= -O0
-.endif
Index: src/sys/arch/hp300/conf/Makefile.hp300
diff -u src/sys/arch/hp300/conf/Makefile.hp300:1.89 src/sys/arch/hp300/conf/Makefile.hp300:1.90
--- src/sys/arch/hp300/conf/Makefile.hp300:1.89 Sat Jul 9 15:01:33 2011
+++ src/sys/arch/hp300/conf/Makefile.hp300 Wed Apr 15 19:13:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp300,v 1.89 2011/07/09 15:01:33 mrg Exp $
+# $NetBSD: Makefile.hp300,v 1.90 2015/04/15 19:13:47 mrg Exp $
# Makefile for NetBSD
#
@@ -70,10 +70,6 @@ dma.o hpux_machdep.o locore.o machdep.o
## (7) misc settings
##
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45
-CWARNFLAGS.diofb.c+= -Wno-cast-qual
-.endif
-
##
## (8) config(8) generated machinery
##
Index: src/sys/arch/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.103 src/sys/arch/sun3/conf/Makefile.sun3:1.104
--- src/sys/arch/sun3/conf/Makefile.sun3:1.103 Sat Jul 9 15:04:06 2011
+++ src/sys/arch/sun3/conf/Makefile.sun3 Wed Apr 15 19:13:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.103 2011/07/09 15:04:06 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.104 2015/04/15 19:13:47 mrg Exp $
# Makefile for NetBSD
#
@@ -33,9 +33,7 @@ GENASSYM_CONF= ${SUN3}/${MACHTYPE}/genas
##
CPPFLAGS+= -Dsun3
CFLAGS+= ${CMACHFLAGS} -fno-defer-pop
-.if defined(HAVE_GCC) && ${HAVE_GCC} != 45
CFLAGS+= -msoft-float
-.endif
AFLAGS+= -x assembler-with-cpp
##
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.37 src/sys/lib/libkern/Makefile.libkern:1.38
--- src/sys/lib/libkern/Makefile.libkern:1.37 Fri Jan 16 18:36:31 2015
+++ src/sys/lib/libkern/Makefile.libkern Wed Apr 15 19:13:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.37 2015/01/16 18:36:31 christos Exp $
+# $NetBSD: Makefile.libkern,v 1.38 2015/04/15 19:13:47 mrg Exp $
#
# Variable definitions for libkern.
@@ -111,7 +111,3 @@ unwanted_file := ${SRCS:M${check_file:.S
SRCS := ${SRCS:N${unwanted_file}}
.endif
.endfor
-
-.if ${HAVE_GCC:U} == "45" && ${MACHINE_CPU} == "hppa"
-COPTS.md5c.c += ${${ACTIVE_CC} == "gcc" :? -O0 :}
-.endif
