[src/trunk]: src remove remaining makefile support for GCC < 45 that i found.

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

details:   https://anonhg.NetBSD.org/src/rev/c461563a1f11
branches:  trunk
changeset: 329947:c461563a1f11
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jun 14 20:49:36 2014 +0000

description:
remove remaining makefile support for GCC < 45 that i found.

diffstat:

 crypto/external/bsd/netpgp/dist/src/libdigest/Makefile |   2 -
 external/bsd/ntp/lib/libiscntp/Makefile                |   4 +-
 external/bsd/ntp/lib/libntp/Makefile                   |   4 +-
 external/bsd/ntp/lib/libopts/Makefile                  |   6 +--
 external/gpl3/Makefile                                 |   4 +-
 external/gpl3/gcc.old/Makefile.gcc_path                |   6 +--
 external/gpl3/gcc.old/lib/libstdc++-v3/Makefile        |   5 +--
 external/gpl3/gcc/Makefile.gcc_path                    |   6 +--
 external/gpl3/gcc/lib/libstdc++-v3/Makefile            |   5 +--
 external/mit/xorg/lib/libGLU/Makefile                  |   4 +-
 external/mit/xorg/lib/libX11/Makefile.libx11           |   6 +--
 external/mit/xorg/lib/libXi/Makefile                   |   6 +--
 games/phantasia/Makefile                               |   4 +-
 lib/libc/softfloat/Makefile.inc                        |   8 ++--
 lib/libedit/Makefile                                   |   4 +-
 sys/arch/vax/conf/Makefile.vax                         |   7 +---
 sys/lib/libsa/Makefile                                 |   4 +-
 sys/lib/libz/Makefile                                  |   4 +-
 tools/Makefile                                         |  31 +++++++----------
 tools/gcc/Makefile                                     |  22 +++---------
 tools/gcc/README.mknative                              |  12 +++---
 x11/lib/GLU/Makefile                                   |   4 +-
 22 files changed, 51 insertions(+), 107 deletions(-)

diffs (truncated from 568 to 300 lines):

diff -r b2b188c43e4d -r c461563a1f11 crypto/external/bsd/netpgp/dist/src/libdigest/Makefile
--- a/crypto/external/bsd/netpgp/dist/src/libdigest/Makefile    Sat Jun 14 20:10:42 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/libdigest/Makefile    Sat Jun 14 20:49:36 2014 +0000
@@ -10,7 +10,5 @@
 
 .include <bsd.lib.mk>
 
-.if ${HAVE_GCC} >= 45
 #COPTS.isns_pdu.c+=     -fno-strict-aliasing
 CPPFLAGS+=     -fno-strict-aliasing
-.endif
diff -r b2b188c43e4d -r c461563a1f11 external/bsd/ntp/lib/libiscntp/Makefile
--- a/external/bsd/ntp/lib/libiscntp/Makefile   Sat Jun 14 20:10:42 2014 +0000
+++ b/external/bsd/ntp/lib/libiscntp/Makefile   Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2014/01/23 14:06:28 joerg Exp $
+#      $NetBSD: Makefile,v 1.9 2014/06/14 20:49:36 mrg Exp $
 
 LIBISPRIVATE=yes
 
@@ -43,8 +43,6 @@
         time.c                     \
         sockaddr.c
 
-.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
 COPTS.log.c+=  -Wno-error=format-nonliteral
-.endif
 
 .include <bsd.lib.mk>
diff -r b2b188c43e4d -r c461563a1f11 external/bsd/ntp/lib/libntp/Makefile
--- a/external/bsd/ntp/lib/libntp/Makefile      Sat Jun 14 20:10:42 2014 +0000
+++ b/external/bsd/ntp/lib/libntp/Makefile      Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2014/01/24 23:42:31 matt Exp $
+#      $NetBSD: Makefile,v 1.12 2014/06/14 20:49:36 mrg Exp $
 
 LIBISPRIVATE=yes
 
@@ -77,9 +77,7 @@
 
 CPPFLAGS+= -I${IDIST}/sntp/libopts
 
-.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
 COPTS.msyslog.c+=      -Wno-error=format-nonliteral
-.endif
 
 # For MKREPRO, avoid using __DATE__ and __TIME__.
 # Instead, use the date and time from ${IMPORTDATE_FILE}.
diff -r b2b188c43e4d -r c461563a1f11 external/bsd/ntp/lib/libopts/Makefile
--- a/external/bsd/ntp/lib/libopts/Makefile     Sat Jun 14 20:10:42 2014 +0000
+++ b/external/bsd/ntp/lib/libopts/Makefile     Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2014/01/20 01:43:34 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2014/06/14 20:49:36 mrg Exp $
 
 LIBISPRIVATE=yes
 
@@ -17,10 +17,6 @@
 SRCS=libopts.c
 
 COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC:U} >= 45
 COPTS.libopts.c+=      ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.else
-COPTS.libopts.c+=      -Wno-format
-.endif
 
 .include <bsd.lib.mk>
diff -r b2b188c43e4d -r c461563a1f11 external/gpl3/Makefile
--- a/external/gpl3/Makefile    Sat Jun 14 20:10:42 2014 +0000
+++ b/external/gpl3/Makefile    Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2014/02/26 09:54:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2014/06/14 20:49:36 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,12 +7,10 @@
 .endif
 
 .if ${MKGCC} != "no"
-.if ${HAVE_GCC} >= 45
 .if ${MKGCCCMDS} != "no"
 SUBDIR+=       ${EXTERNAL_GCC_SUBDIR}
 .endif
 .endif
-.endif
 
 .if ${MKGDB} != "no"
 .if ${HAVE_GDB} == "7"
diff -r b2b188c43e4d -r c461563a1f11 external/gpl3/gcc.old/Makefile.gcc_path
--- a/external/gpl3/gcc.old/Makefile.gcc_path   Sat Jun 14 20:10:42 2014 +0000
+++ b/external/gpl3/gcc.old/Makefile.gcc_path   Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gcc_path,v 1.1.1.1 2014/02/26 10:56:10 mrg Exp $
+#      $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:37 mrg Exp $
 
 # Define some commom paths
 
@@ -7,11 +7,7 @@
 
 .include <bsd.own.mk>
 
-.if ${HAVE_GCC} >= 45
 GCC_SUBDIR=    ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}
-.else
-GCC_SUBDIR=    /not/here/for/you
-.endif
 
 #.if exists(${GCC_SUBDIR}/dist)
 GCCDIST=       ${GCC_SUBDIR}/dist
diff -r b2b188c43e4d -r c461563a1f11 external/gpl3/gcc.old/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile   Sat Jun 14 20:10:42 2014 +0000
+++ b/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile   Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.2 2014/02/26 10:57:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/06/14 20:49:37 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -52,8 +52,6 @@
 COPTS.concept-inst.cc= -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates
 CPPFLAGS.strstream.cc= -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
 
-# For GCC 4.5
-.if ${HAVE_GCC} >= 45
 # XXX also need this for some PCHs.
 CPPFLAGS.atomic.cc = -std=gnu++0x
 CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
@@ -76,7 +74,6 @@
 CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
-.endif
 
 # XXX
 MKDEPFLAGS+=   -I$(GLIBCPP_INCLUDE_DIR)/backward
diff -r b2b188c43e4d -r c461563a1f11 external/gpl3/gcc/Makefile.gcc_path
--- a/external/gpl3/gcc/Makefile.gcc_path       Sat Jun 14 20:10:42 2014 +0000
+++ b/external/gpl3/gcc/Makefile.gcc_path       Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gcc_path,v 1.1 2014/02/26 09:54:32 mrg Exp $
+#      $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:36 mrg Exp $
 
 # Define some commom paths
 
@@ -7,11 +7,7 @@
 
 .include <bsd.own.mk>
 
-.if ${HAVE_GCC} >= 45
 GCC_SUBDIR=    ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}
-.else
-GCC_SUBDIR=    /not/here/for/you
-.endif
 
 #.if exists(${GCC_SUBDIR}/dist)
 GCCDIST=       ${GCC_SUBDIR}/dist
diff -r b2b188c43e4d -r c461563a1f11 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Sat Jun 14 20:10:42 2014 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2014/06/01 19:51:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2014/06/14 20:49:36 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -57,8 +57,6 @@
 COPTS.bitmap_allocator.cc = -fimplicit-templates
 CPPFLAGS.strstream.cc= -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
 
-# For GCC 4.5
-.if ${HAVE_GCC} >= 45
 # XXX also need this for some PCHs.
 CPPFLAGS.atomic.cc = -std=gnu++0x
 CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
@@ -81,7 +79,6 @@
 CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
-.endif
 
 cp-demangle.d cp-demangle.o: cp-demangle.h
 
diff -r b2b188c43e4d -r c461563a1f11 external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile     Sat Jun 14 20:10:42 2014 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile     Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2013/09/12 17:14:20 joerg Exp $
+#      $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
 
 NOLINT=                1       # XTODO: tess.ln SIGSEGVs lint :(
 
@@ -89,11 +89,9 @@
 .include <bsd.lib.mk>
 
 # XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
 COPTS.arcsorter.cc+=   -Wno-error
 COPTS.sorter.cc+=      -Wno-error
 COPTS.tobezier.cc+=    -Wno-error
-.endif
 
 .if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
 COPTS.sampleCompTop.cc+=       -O0
diff -r b2b188c43e4d -r c461563a1f11 external/mit/xorg/lib/libX11/Makefile.libx11
--- a/external/mit/xorg/lib/libX11/Makefile.libx11      Sat Jun 14 20:10:42 2014 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11      Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libx11,v 1.12 2013/10/18 01:12:00 riz Exp $
+#      $NetBSD: Makefile.libx11,v 1.13 2014/06/14 20:49:37 mrg Exp $
 
 LIB=   X11
 .PATH: ${X11SRCDIR.${LIB}}/src
@@ -462,10 +462,6 @@
 COPTS.OpenDis.c+=      -Wno-error      # XXX xf86bigfstr.h
 COPTS.XlibInt.c+=      -Wno-error      # XXX xcmiscstr.h
 COPTS.XKBBind.c+=      -Wno-error      # uses XKeycodeToKeysym
-.if defined(HAVE_GCC) &&  ${HAVE_GCC} < 45
-COPTS.LiHosts.c+=      -Wno-error      # XXX: old gcc figures out that const
-                                       # cond because nHosts < max_hosts
-.endif
 
 CWARNFLAGS.clang+=     -Wno-string-plus-int
 
diff -r b2b188c43e4d -r c461563a1f11 external/mit/xorg/lib/libXi/Makefile
--- a/external/mit/xorg/lib/libXi/Makefile      Sat Jun 14 20:10:42 2014 +0000
+++ b/external/mit/xorg/lib/libXi/Makefile      Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2014/03/16 22:53:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -81,10 +81,6 @@
 COPTS.XExtInt.c+=      -Wno-error      # XXX
 COPTS.XSndExEv.c+=     -Wno-error      # XXX
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
-COPTS.XGetFCtl.c+=     -Wno-error      # XXX
-.endif
-
 CWARNFLAGS.clang+=     -Wno-pointer-sign
 
 # XXX manuals
diff -r b2b188c43e4d -r c461563a1f11 games/phantasia/Makefile
--- a/games/phantasia/Makefile  Sat Jun 14 20:10:42 2014 +0000
+++ b/games/phantasia/Makefile  Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.36 2013/02/16 17:00:21 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.37 2014/06/14 20:49:37 mrg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -53,6 +53,6 @@
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax"
+.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
 COPTS.misc.c+= -O0
 .endif
diff -r b2b188c43e4d -r c461563a1f11 lib/libc/softfloat/Makefile.inc
--- a/lib/libc/softfloat/Makefile.inc   Sat Jun 14 20:10:42 2014 +0000
+++ b/lib/libc/softfloat/Makefile.inc   Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2014/01/30 19:11:54 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2014/06/14 20:49:37 mrg Exp $
 
 SOFTFLOAT_BITS?=64
 .PATH:         ${ARCHDIR}/softfloat \
@@ -30,13 +30,13 @@
 SRCS+=         ${SRCS.softfloat}
 
 # XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
-.if (${MACHINE_CPU} == "arm")
+.if defined(HAVE_GCC)
+. if (${MACHINE_CPU} == "arm")
 # See doc/HACKS for more information.
 COPTS.softfloat.c+=    -Wno-enum-compare
 COPTS.softfloat.c+=    ${${ACTIVE_CXX} == "gcc":? -fno-tree-vrp :}
 .elif (${MACHINE_CPU} == "mips" || \
      ${MACHINE_CPU} == "sh3")
 COPTS.softfloat.c+=    -Wno-enum-compare
+. endif
 .endif
-.endif
diff -r b2b188c43e4d -r c461563a1f11 lib/libedit/Makefile
--- a/lib/libedit/Makefile      Sat Jun 14 20:10:42 2014 +0000
+++ b/lib/libedit/Makefile      Sat Jun 14 20:49:36 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.51 2012/08/10 12:20:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.52 2014/06/14 20:49:37 mrg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
 USE_SHLIBDIR=  yes
@@ -127,7 +127,7 @@
 .include <bsd.subdir.mk>