Module Name: src
Committed By: rillig
Date: Tue May 3 19:05:34 UTC 2022
Modified Files:
src/usr.bin/make: Makefile test-variants.mk
Log Message:
make: remove test scenarios for old GCC versions
These had been useful for NetBSD 8, which used GCC 5.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/usr.bin/make/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/test-variants.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.121 src/usr.bin/make/Makefile:1.122
--- src/usr.bin/make/Makefile:1.121 Wed Jan 26 23:00:55 2022
+++ src/usr.bin/make/Makefile Tue May 3 19:05:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2022/01/26 23:00:55 rillig Exp $
+# $NetBSD: Makefile,v 1.122 2022/05/03 19:05:34 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -54,39 +54,6 @@ COPTS+= -fsanitize=undefined
LDADD+= -fsanitize=undefined
.endif
-# Whether to compile with GCC 10 from pkgsrc, during development.
-USE_GCC10?= no
-.if ${USE_GCC10} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
-# Whether to compile with GCC 9 from pkgsrc, during development.
-USE_GCC9?= no
-.if ${USE_GCC9} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
-# Whether to compile with GCC 8 from pkgsrc, during development.
-USE_GCC8?= no
-.if ${USE_GCC8} == "yes"
-# CC is set further down in this file
-COPTS+= -Wno-attributes # for abs and labs
-COPTS.arch.c+= -Wno-error=format-truncation
-COPTS.dir.c+= -Wno-error=format-truncation
-COPTS.main.c+= -Wno-error=format-truncation
-COPTS.meta.c+= -Wno-error=format-truncation
-.endif
-
USE_META?= yes
.if ${USE_META:tl} != "no"
@@ -129,24 +96,6 @@ COPTS.var.c+= -Wno-format-nonliteral # s
CPPFLAGS+= -DMAKE_NATIVE
-.if ${USE_GCC10} == "yes"
-GCC10BASE?= /usr/pkg/gcc10
-LATE_CC= ${GCC10BASE}/bin/gcc
-GCOV= ${GCC10BASE}/bin/gcov
-.endif
-
-.if ${USE_GCC9} == "yes"
-GCC9BASE?= /usr/pkg/gcc9
-LATE_CC= ${GCC9BASE}/bin/gcc
-GCOV= ${GCC9BASE}/bin/gcov
-.endif
-
-.if ${USE_GCC8} == "yes"
-GCC8BASE?= /usr/pkg/gcc8
-LATE_CC= ${GCC8BASE}/bin/gcc
-GCOV= ${GCC8BASE}/bin/gcov
-.endif
-
.if defined(TOOLDIR)
# This is a native NetBSD build, use libutil rather than the local emalloc etc.
CPPFLAGS+= -DUSE_EMALLOC
@@ -204,6 +153,3 @@ report-coverage: .PHONY
CPPFLAGS+= ${USER_CPPFLAGS}
# For overriding -std=gnu99 or similar options.
CFLAGS+= ${USER_CFLAGS}
-.if defined(LATE_CC)
-CC= ${LATE_CC}
-.endif
Index: src/usr.bin/make/test-variants.mk
diff -u src/usr.bin/make/test-variants.mk:1.2 src/usr.bin/make/test-variants.mk:1.3
--- src/usr.bin/make/test-variants.mk:1.2 Thu Mar 3 20:03:19 2022
+++ src/usr.bin/make/test-variants.mk Tue May 3 19:05:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: test-variants.mk,v 1.2 2022/03/03 20:03:19 rillig Exp $
+# $NetBSD: test-variants.mk,v 1.3 2022/05/03 19:05:34 rillig Exp $
#
# Build several variants of make and run the tests on them.
#
@@ -27,12 +27,6 @@ TESTS+= default
TESTS+= llvm
ENV.llvm= HAVE_LLVM="yes"
-TESTS+= gcc8
-ENV.gcc8= USE_GCC8="yes"
-
-TESTS+= gcc9
-ENV.gcc9= USE_GCC9="yes"
-
# Use emalloc for memory allocation.
TESTS+= emalloc
ENV.emalloc= TOOLDIR=""
@@ -182,37 +176,36 @@ ENV.fort= USE_FORT="yes"
TESTS+= abs
ENV.abs= USE_ABSOLUTE_TESTNAMES="yes"
-# This test is the result of reading through the GCC "Warning Options"
+# This test is the result of reading through the GCC 10 "Warning Options"
# documentation, noting down everything that sounded interesting.
#
-TESTS+= gcc10-warn
-ENV.gcc10-warn= USE_GCC10=yes
-CFLAGS.gcc10-warn= -Wmisleading-indentation
-CFLAGS.gcc10-warn+= -Wmissing-attributes
-CFLAGS.gcc10-warn+= -Wmissing-braces
-CFLAGS.gcc10-warn+= -Wextra
-CFLAGS.gcc10-warn+= -Wnonnull
-CFLAGS.gcc10-warn+= -Wnonnull-compare
-CFLAGS.gcc10-warn+= -Wnull-dereference
-CFLAGS.gcc10-warn+= -Wimplicit
-CFLAGS.gcc10-warn+= -Wimplicit-fallthrough=4
-CFLAGS.gcc10-warn+= -Wignored-qualifiers
-CFLAGS.gcc10-warn+= -Wunused
-CFLAGS.gcc10-warn+= -Wunused-but-set-variable
-CFLAGS.gcc10-warn+= -Wunused-parameter
-CFLAGS.gcc10-warn+= -Wduplicated-branches
-CFLAGS.gcc10-warn+= -Wduplicated-cond
-CFLAGS.gcc10-warn+= -Wunused-macros
-CFLAGS.gcc10-warn+= -Wcast-function-type
-CFLAGS.gcc10-warn+= -Wconversion
-CFLAGS.gcc10-warn+= -Wenum-compare
-CFLAGS.gcc10-warn+= -Wmissing-field-initializers
-CFLAGS.gcc10-warn+= -Wredundant-decls
-CFLAGS.gcc10-warn+= -Wno-error=conversion
-CFLAGS.gcc10-warn+= -Wno-error=sign-conversion
-CFLAGS.gcc10-warn+= -Wno-error=unused-macros
-CFLAGS.gcc10-warn+= -Wno-error=unused-parameter
-CFLAGS.gcc10-warn+= -Wno-error=duplicated-branches
+TESTS+= gcc-warn
+CFLAGS.gcc-warn= -Wmisleading-indentation
+CFLAGS.gcc-warn+= -Wmissing-attributes
+CFLAGS.gcc-warn+= -Wmissing-braces
+CFLAGS.gcc-warn+= -Wextra
+CFLAGS.gcc-warn+= -Wnonnull
+CFLAGS.gcc-warn+= -Wnonnull-compare
+CFLAGS.gcc-warn+= -Wnull-dereference
+CFLAGS.gcc-warn+= -Wimplicit
+CFLAGS.gcc-warn+= -Wimplicit-fallthrough=4
+CFLAGS.gcc-warn+= -Wignored-qualifiers
+CFLAGS.gcc-warn+= -Wunused
+CFLAGS.gcc-warn+= -Wunused-but-set-variable
+CFLAGS.gcc-warn+= -Wunused-parameter
+CFLAGS.gcc-warn+= -Wduplicated-branches
+CFLAGS.gcc-warn+= -Wduplicated-cond
+CFLAGS.gcc-warn+= -Wunused-macros
+CFLAGS.gcc-warn+= -Wcast-function-type
+CFLAGS.gcc-warn+= -Wconversion
+CFLAGS.gcc-warn+= -Wenum-compare
+CFLAGS.gcc-warn+= -Wmissing-field-initializers
+CFLAGS.gcc-warn+= -Wredundant-decls
+CFLAGS.gcc-warn+= -Wno-error=conversion
+CFLAGS.gcc-warn+= -Wno-error=sign-conversion
+CFLAGS.gcc-warn+= -Wno-error=unused-macros
+CFLAGS.gcc-warn+= -Wno-error=unused-parameter
+CFLAGS.gcc-warn+= -Wno-error=duplicated-branches
.for shell in /usr/pkg/bin/bash /usr/pkg/bin/dash
. if exists(${shell})
