[src/trunk]: src/share/mk remove conditionals that are always true with GCC >...

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

details:   https://anonhg.NetBSD.org/src/rev/c51db19ae9d8
branches:  trunk
changeset: 344097:c51db19ae9d8
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Mar 12 23:08:58 2016 +0000

description:
remove conditionals that are always true with GCC >= 4.8.

diffstat:

 share/mk/bsd.lib.mk  |  4 ++--
 share/mk/bsd.prog.mk |  4 ++--
 share/mk/bsd.sys.mk  |  6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r c2bea955c00e -r c51db19ae9d8 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Sat Mar 12 23:07:05 2016 +0000
+++ b/share/mk/bsd.lib.mk       Sat Mar 12 23:08:58 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.366 2016/02/27 23:51:34 christos Exp $
+#      $NetBSD: bsd.lib.mk,v 1.367 2016/03/12 23:08:58 mrg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -188,7 +188,7 @@
 .if defined(CTFCONVERT)
 .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
 CTFFLAGS+=     -g
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
+.if defined(HAVE_GCC)
 #CFLAGS+=      -gdwarf-2
 .endif
 .endif
diff -r c2bea955c00e -r c51db19ae9d8 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sat Mar 12 23:07:05 2016 +0000
+++ b/share/mk/bsd.prog.mk      Sat Mar 12 23:08:58 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.296 2016/02/21 03:34:27 christos Exp $
+#      $NetBSD: bsd.prog.mk,v 1.297 2016/03/12 23:08:58 mrg Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -65,7 +65,7 @@
 .if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
 CTFFLAGS+= -g
 CTFMFLAGS+= -g
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
+.if defined(HAVE_GCC)
 #CFLAGS+=-gdwarf-2
 .endif
 .endif
diff -r c2bea955c00e -r c51db19ae9d8 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Sat Mar 12 23:07:05 2016 +0000
+++ b/share/mk/bsd.sys.mk       Sat Mar 12 23:08:58 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.253 2016/02/27 18:55:15 joerg Exp $
+#      $NetBSD: bsd.sys.mk,v 1.254 2016/03/12 23:08:58 mrg Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -85,7 +85,7 @@
 .if ${WARNS} > 4
 CFLAGS+=       -Wold-style-definition
 .endif
-.if ${WARNS} > 5 && !(defined(HAVE_GCC) && ${HAVE_GCC:U0} <= 45)
+.if ${WARNS} > 5
 CFLAGS+=       -Wconversion
 .endif
 CFLAGS+=       -Wsign-compare -Wformat=2
@@ -103,11 +103,9 @@
 # XXX GCC 4.5 for sh3 and m68k (which we compile with -Os) is extra noisy for
 # cases it should be better with
 CFLAGS+=       -Wno-uninitialized
-.if ${HAVE_GCC} >= 48
 CFLAGS+=       -Wno-maybe-uninitialized
 .endif
 .endif
-.endif
 
 CWARNFLAGS+=   ${CWARNFLAGS.${ACTIVE_CC}}