Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src convert HAVE_GCC == 7 to HAVE_GCC >= 7.



details:   https://anonhg.NetBSD.org/src/rev/61795e70ee4b
branches:  trunk
changeset: 1003775:61795e70ee4b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Sep 29 23:44:58 2019 +0000

description:
convert HAVE_GCC == 7 to HAVE_GCC >= 7.

diffstat:

 bin/ksh/Makefile                                     |  4 ++--
 crypto/external/bsd/netpgp/bin/netpgpverify/Makefile |  4 ++--
 crypto/external/bsd/netpgp/lib/verify/Makefile       |  4 ++--
 crypto/external/bsd/openssh/bin/sftp/Makefile        |  4 ++--
 distrib/utils/zcat/Makefile                          |  4 ++--
 external/bsd/atf/lib/tools/Makefile                  |  4 ++--
 external/bsd/flex/bin/Makefile                       |  4 ++--
 external/bsd/ipf/bin/ipf/Makefile                    |  4 ++--
 external/bsd/ipf/bin/ipftest/Makefile                |  4 ++--
 external/bsd/ntp/Makefile.inc                        |  4 ++--
 external/bsd/pdisk/bin/Makefile                      |  4 ++--
 external/bsd/pkg_install/Makefile.inc                |  4 ++--
 games/backgammon/common_source/Makefile              |  4 ++--
 games/hunt/huntd/Makefile                            |  4 ++--
 lib/libbz2/Makefile                                  |  4 ++--
 lib/libz/Makefile                                    |  4 ++--
 sys/lib/libkern/Makefile.compiler-rt                 |  4 ++--
 sys/modules/ath_hal/Makefile                         |  4 ++--
 sys/modules/i915drmkms/Makefile                      |  4 ++--
 sys/modules/pf/Makefile                              |  4 ++--
 sys/modules/radeondrm/Makefile                       |  4 ++--
 sys/modules/savagedrm/Makefile                       |  4 ++--
 sys/modules/viadrmums/Makefile                       |  4 ++--
 sys/modules/zlib/Makefile                            |  4 ++--
 sys/rump/kern/lib/libz/Makefile                      |  4 ++--
 tests/kernel/Makefile                                |  4 ++--
 tests/lib/libc/misc/Makefile                         |  4 ++--
 tests/lib/libc/ssp/Makefile                          |  4 ++--
 usr.bin/make/Makefile                                |  4 ++--
 usr.bin/newsyslog/Makefile                           |  4 ++--
 usr.bin/rdist/Makefile                               |  4 ++--
 usr.bin/stat/Makefile                                |  4 ++--
 usr.bin/systat/Makefile                              |  4 ++--
 usr.bin/telnet/Makefile                              |  4 ++--
 usr.sbin/quotacheck/Makefile                         |  4 ++--
 usr.sbin/sysinst/Makefile.inc                        |  6 +++---
 usr.sbin/syslogd/Makefile                            |  4 ++--
 37 files changed, 75 insertions(+), 75 deletions(-)

diffs (truncated from 668 to 300 lines):

diff -r d243edc26e03 -r 61795e70ee4b bin/ksh/Makefile
--- a/bin/ksh/Makefile  Sun Sep 29 22:10:55 2019 +0000
+++ b/bin/ksh/Makefile  Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2019/02/04 04:05:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.36 2019/09/29 23:44:58 mrg Exp $
 
 WARNS=3
 CWARNFLAGS.clang+=     -Wno-error=cast-qual
@@ -48,7 +48,7 @@
        ${HOST_SH} $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \
            && mv ksh.1.tmp ksh.1
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS+=        -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Sun Sep 29 22:10:55 2019 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2019/02/04 04:05:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.17 2019/09/29 23:44:58 mrg Exp $
 
 PROG=netpgpverify
 BINDIR=                /usr/bin
@@ -28,7 +28,7 @@
 
 .include <bsd.own.mk>
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS+=        -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Sun Sep 29 22:10:55 2019 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/29 23:44:58 mrg Exp $
 
 LIB=netpgpverify
 SRCS+=b64.c
@@ -27,7 +27,7 @@
 
 .include <bsd.own.mk>
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS+=        -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b crypto/external/bsd/openssh/bin/sftp/Makefile
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile     Sun Sep 29 22:10:55 2019 +0000
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile     Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2019/02/04 04:05:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
 
 BINDIR=        /usr/bin
 
@@ -14,7 +14,7 @@
 
 .include <bsd.own.mk>
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.sftp.c+=         -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b distrib/utils/zcat/Makefile
--- a/distrib/utils/zcat/Makefile       Sun Sep 29 22:10:55 2019 +0000
+++ b/distrib/utils/zcat/Makefile       Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/02/06 09:17:18 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2019/09/29 23:44:58 mrg Exp $
 # Small zcat (i.e. for install media)
 #
 
@@ -26,7 +26,7 @@
 CPPFLAGS+=     -Dsnprintf=snprintf_ss -Dsprintf=sprintf_ss
 CPPFLAGS+=     -Dstrerror=strerror_ss
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.inflate.c+=      -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/atf/lib/tools/Makefile
--- a/external/bsd/atf/lib/tools/Makefile       Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/atf/lib/tools/Makefile       Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $
 
 NOLINT=                # defined
 
@@ -36,7 +36,7 @@
                ui.cpp \
                user.cpp
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.parser.cpp += -Wno-error=maybe-uninitialized
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/flex/bin/Makefile
--- a/external/bsd/flex/bin/Makefile    Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/flex/bin/Makefile    Sun Sep 29 23:44:58 2019 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.4 (Berkeley) 6/24/90
-#      $NetBSD: Makefile,v 1.13 2019/02/05 07:47:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2019/09/29 23:44:58 mrg Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -72,7 +72,7 @@
 scan.o yylex.o: parse.h
 
 # Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 . if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
 COPTS.scan.c+=        -O1
 . endif
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/ipf/bin/ipf/Makefile
--- a/external/bsd/ipf/bin/ipf/Makefile Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/ipf/bin/ipf/Makefile Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2019/02/05 08:08:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2019/09/29 23:44:58 mrg Exp $
 
 .include <bsd.own.mk>          # for MKDYNAMICROOT definition
 
@@ -42,7 +42,7 @@
 .endif
 
 # Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 . if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
 COPTS.ipf_y.c+=        -O1
 . endif
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/ipf/bin/ipftest/Makefile
--- a/external/bsd/ipf/bin/ipftest/Makefile     Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/ipf/bin/ipftest/Makefile     Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2019/02/05 08:08:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2019/09/29 23:44:58 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -103,7 +103,7 @@
            ${.ALLSRC} > ${.TARGET}
 
 # Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 . if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
 COPTS.ipf_y.c+=        -O1
 . endif
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/ntp/Makefile.inc
--- a/external/bsd/ntp/Makefile.inc     Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/ntp/Makefile.inc     Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.19 2019/09/29 23:44:59 mrg Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -67,7 +67,7 @@
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.configfile.c+=           -Wno-error=implicit-fallthrough
 COPTS.libopts.c+=              -Wno-error=implicit-fallthrough
 COPTS.ntp_loopfilter.c+=       -Wno-error=implicit-fallthrough
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/pdisk/bin/Makefile
--- a/external/bsd/pdisk/bin/Makefile   Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/pdisk/bin/Makefile   Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2019/02/04 04:05:16 mrg Exp $   
+#      $NetBSD: Makefile,v 1.3 2019/09/29 23:44:59 mrg Exp $   
 
 .include <bsd.own.mk>
 WARNS=5
@@ -20,7 +20,7 @@
 
 CPPFLAGS+=     -D__unix__
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.file_media.c+=   -Wno-error=implicit-fallthrough
 COPTS.pathname.c+=     -Wno-error=implicit-fallthrough
 COPTS.pdisk.c+=                -Wno-error=implicit-fallthrough
diff -r d243edc26e03 -r 61795e70ee4b external/bsd/pkg_install/Makefile.inc
--- a/external/bsd/pkg_install/Makefile.inc     Sun Sep 29 22:10:55 2019 +0000
+++ b/external/bsd/pkg_install/Makefile.inc     Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2019/02/07 23:53:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2019/09/29 23:44:59 mrg Exp $
 
 DIST=  ${NETBSDSRCDIR}/external/bsd/pkg_install/dist
 
@@ -15,7 +15,7 @@
 .include <bsd.own.mk>
 
 # show_version() does not return
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.main.c+=         -Wno-error=implicit-fallthrough
 COPTS.pkg_delete.c+=   -Wno-error=implicit-fallthrough
 .endif
diff -r d243edc26e03 -r 61795e70ee4b games/backgammon/common_source/Makefile
--- a/games/backgammon/common_source/Makefile   Sun Sep 29 22:10:55 2019 +0000
+++ b/games/backgammon/common_source/Makefile   Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2019/02/04 09:51:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2019/09/29 23:44:59 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -9,7 +9,7 @@
 .include <bsd.own.mk>
 
 # Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.check.c+=        -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b games/hunt/huntd/Makefile
--- a/games/hunt/huntd/Makefile Sun Sep 29 22:10:55 2019 +0000
+++ b/games/hunt/huntd/Makefile Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2019/02/04 09:51:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2019/09/29 23:44:59 mrg Exp $
 
 PROG=  huntd
 SRCS=  answer.c draw.c driver.c execute.c expl.c \
@@ -10,7 +10,7 @@
 .include <bsd.own.mk>
 
 # Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.shots.c+=        -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b lib/libbz2/Makefile
--- a/lib/libbz2/Makefile       Sun Sep 29 22:10:55 2019 +0000
+++ b/lib/libbz2/Makefile       Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2019/02/04 04:05:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.20 2019/09/29 23:44:59 mrg Exp $
 
 USE_FORT?= yes # data driven bugs?
 
@@ -20,7 +20,7 @@
 COPTS+=                -O0
 .endif
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS+=                -Wno-error=implicit-fallthrough
 .endif
 
diff -r d243edc26e03 -r 61795e70ee4b lib/libz/Makefile
--- a/lib/libz/Makefile Sun Sep 29 22:10:55 2019 +0000
+++ b/lib/libz/Makefile Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2019/02/04 04:05:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.25 2019/09/29 23:44:59 mrg Exp $
 
 WARNS= 3
 
@@ -29,7 +29,7 @@
 FILESMODE_zlib.pc=     ${NONBINMODE}
 FILESDIR_zlib.pc=      /usr/lib/pkgconfig
 
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
 COPTS.infback.c+=      -Wno-error=implicit-fallthrough
 COPTS.inflate.c+=      -Wno-error=implicit-fallthrough
 .endif
diff -r d243edc26e03 -r 61795e70ee4b sys/lib/libkern/Makefile.compiler-rt
--- a/sys/lib/libkern/Makefile.compiler-rt      Sun Sep 29 22:10:55 2019 +0000
+++ b/sys/lib/libkern/Makefile.compiler-rt      Sun Sep 29 23:44:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.compiler-rt,v 1.9 2019/04/05 14:00:16 thorpej Exp $
+# $NetBSD: Makefile.compiler-rt,v 1.10 2019/09/29 23:44:59 mrg Exp $
 
 COMPILER_RT_SRCDIR=    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -128,7 +128,7 @@
 CPPFLAGS.int_util.c+=  -DKERNEL_USE



Home | Main Index | Thread Index | Old Index