svn commit: r352094 - in stable/12: share/mk sys/arm/conf sys/conf sys/modules/linux sys/modules/linux64 sys/powerpc/conf sys/powerpc/conf/dpaa usr.sbin/pmcstudy
Warner Losh
imp at FreeBSD.org
Mon Sep 9 18:27:58 UTC 2019
Author: imp
Date: Mon Sep 9 18:27:52 2019
New Revision: 352094
URL: https://svnweb.freebsd.org/changeset/base/352094
Log:
MFC: r351429,351430,351485,351497,351498
Merge changes to turn off -Werror for gcc 4.2.1 by default as part of
the plan to deorbit gcc 4.2.1 from -head before 13.0.
Relnotes: Yes
Modified:
stable/12/share/mk/bsd.sys.mk
stable/12/sys/arm/conf/ALPINE
stable/12/sys/arm/conf/ARMADA38X
stable/12/sys/arm/conf/ARMADAXP
stable/12/sys/arm/conf/DB-78XXX
stable/12/sys/arm/conf/DB-88F5XXX
stable/12/sys/arm/conf/DB-88F6XXX
stable/12/sys/arm/conf/RT1310
stable/12/sys/arm/conf/SHEEVAPLUG
stable/12/sys/arm/conf/SOCFPGA
stable/12/sys/arm/conf/TS7800
stable/12/sys/arm/conf/VYBRID
stable/12/sys/conf/files.amd64
stable/12/sys/conf/files.i386
stable/12/sys/conf/kern.pre.mk
stable/12/sys/conf/kmod.mk
stable/12/sys/modules/linux/Makefile
stable/12/sys/modules/linux64/Makefile
stable/12/sys/powerpc/conf/MPC85XX
stable/12/sys/powerpc/conf/MPC85XXSPE
stable/12/sys/powerpc/conf/QORIQ64
stable/12/sys/powerpc/conf/dpaa/DPAA
stable/12/usr.sbin/pmcstudy/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/mk/bsd.sys.mk
==============================================================================
--- stable/12/share/mk/bsd.sys.mk Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/share/mk/bsd.sys.mk Mon Sep 9 18:27:52 2019 (r352094)
@@ -29,6 +29,15 @@ CFLAGS+= -std=${CSTD}
CXXFLAGS+= -std=${CXXSTD}
.endif
+#
+# Turn off -Werror for gcc 4.2.1. The compiler is on the glide path out of the
+# system, and any warnings specific to it are no longer relevant as there are
+# too many false positives.
+#
+.if ${COMPILER_VERSION} < 50000
+NO_WERROR.gcc= yes
+.endif
+
# -pedantic is problematic because it also imposes namespace restrictions
#CFLAGS+= -pedantic
.if defined(WARNS)
Modified: stable/12/sys/arm/conf/ALPINE
==============================================================================
--- stable/12/sys/arm/conf/ALPINE Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/ALPINE Mon Sep 9 18:27:52 2019 (r352094)
@@ -23,7 +23,6 @@ include "std.armv7"
include "../annapurna/alpine/std.alpine"
makeoptions MODULES_OVERRIDE=""
-makeoptions WERROR="-Werror"
options SCHED_4BSD # 4BSD scheduler
options SMP # Enable multiple cores
Modified: stable/12/sys/arm/conf/ARMADA38X
==============================================================================
--- stable/12/sys/arm/conf/ARMADA38X Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/ARMADA38X Mon Sep 9 18:27:52 2019 (r352094)
@@ -11,7 +11,6 @@ ident ARMADA38X
options SOC_MV_ARMADA38X
-makeoptions WERROR="-Werror"
makeoptions MODULES_EXTRA="dtb/mv"
options MD_ROOT
Modified: stable/12/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/12/sys/arm/conf/ARMADAXP Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/ARMADAXP Mon Sep 9 18:27:52 2019 (r352094)
@@ -27,8 +27,6 @@ include "../mv/armadaxp/std.mv78x60"
options SOC_MV_ARMADAXP
-makeoptions WERROR="-Werror"
-
options SCHED_ULE # ULE scheduler
options SMP # Enable multiple cores
Modified: stable/12/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/12/sys/arm/conf/DB-78XXX Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/DB-78XXX Mon Sep 9 18:27:52 2019 (r352094)
@@ -10,8 +10,6 @@ include "../mv/discovery/std.db78xxx"
options SOC_MV_DISCOVERY
-makeoptions WERROR="-Werror"
-
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
Modified: stable/12/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/12/sys/arm/conf/DB-88F5XXX Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/DB-88F5XXX Mon Sep 9 18:27:52 2019 (r352094)
@@ -10,8 +10,6 @@ include "../mv/orion/std.db88f5xxx"
options SOC_MV_ORION
-makeoptions WERROR="-Werror"
-
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
Modified: stable/12/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/12/sys/arm/conf/DB-88F6XXX Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/DB-88F6XXX Mon Sep 9 18:27:52 2019 (r352094)
@@ -10,8 +10,6 @@ include "../mv/kirkwood/std.db88f6xxx"
options SOC_MV_KIRKWOOD
-makeoptions WERROR="-Werror"
-
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
Modified: stable/12/sys/arm/conf/RT1310
==============================================================================
--- stable/12/sys/arm/conf/RT1310 Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/RT1310 Mon Sep 9 18:27:52 2019 (r352094)
@@ -16,7 +16,6 @@ makeoptions FDT_DTS_FILE=wzr2-g300n.dts
makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-makeoptions WERROR="-Werror"
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
Modified: stable/12/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- stable/12/sys/arm/conf/SHEEVAPLUG Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/SHEEVAPLUG Mon Sep 9 18:27:52 2019 (r352094)
@@ -11,8 +11,6 @@ include "../mv/kirkwood/std.db88f6xxx"
options SOC_MV_KIRKWOOD
-makeoptions WERROR="-Werror"
-
options HZ=1000
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
Modified: stable/12/sys/arm/conf/SOCFPGA
==============================================================================
--- stable/12/sys/arm/conf/SOCFPGA Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/SOCFPGA Mon Sep 9 18:27:52 2019 (r352094)
@@ -24,8 +24,6 @@ include "../altera/socfpga/std.socfpga"
makeoptions MODULES_OVERRIDE=""
-makeoptions WERROR="-Werror"
-
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
options SMP # Enable multiple cores
Modified: stable/12/sys/arm/conf/TS7800
==============================================================================
--- stable/12/sys/arm/conf/TS7800 Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/TS7800 Mon Sep 9 18:27:52 2019 (r352094)
@@ -10,8 +10,6 @@ include "../mv/orion/std.ts7800"
options SOC_MV_ORION
-makeoptions WERROR="-Werror"
-
options SCHED_4BSD # 4BSD scheduler
options INET # InterNETworking
options INET6 # IPv6 communications protocols
Modified: stable/12/sys/arm/conf/VYBRID
==============================================================================
--- stable/12/sys/arm/conf/VYBRID Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/arm/conf/VYBRID Mon Sep 9 18:27:52 2019 (r352094)
@@ -22,8 +22,6 @@ ident VYBRID
include "std.armv7"
include "../freescale/vybrid/std.vybrid"
-makeoptions WERROR="-Werror"
-
options SCHED_4BSD # 4BSD scheduler
options PLATFORM # Platform based SoC
#options NANDFS # NAND Filesystem
Modified: stable/12/sys/conf/files.amd64
==============================================================================
--- stable/12/sys/conf/files.amd64 Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/conf/files.amd64 Mon Sep 9 18:27:52 2019 (r352094)
@@ -46,7 +46,7 @@ linux32_assym.h optional compat_linux32 \
#
linux32_locore.o optional compat_linux32 \
dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.s" \
- compile-with "${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/amd64/linux32/linux32_vdso.lds.s -Wl,-soname=linux32_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
+ compile-with "${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s -pipe -I. -I$S ${WERROR} -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/amd64/linux32/linux32_vdso.lds.s -Wl,-soname=linux32_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
no-obj no-implicit-rule \
clean "linux32_locore.o"
#
Modified: stable/12/sys/conf/files.i386
==============================================================================
--- stable/12/sys/conf/files.i386 Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/conf/files.i386 Mon Sep 9 18:27:52 2019 (r352094)
@@ -33,7 +33,7 @@ linux_assym.h optional compat_linux \
#
linux_locore.o optional compat_linux \
dependency "linux_assym.h $S/i386/linux/linux_locore.s" \
- compile-with "${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/i386/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
+ compile-with "${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S ${WERROR} -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/i386/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
no-obj no-implicit-rule \
clean "linux_locore.o"
#
Modified: stable/12/sys/conf/kern.pre.mk
==============================================================================
--- stable/12/sys/conf/kern.pre.mk Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/conf/kern.pre.mk Mon Sep 9 18:27:52 2019 (r352094)
@@ -93,7 +93,11 @@ CFLAGS.gcc+= -fms-extensions
.if defined(CFLAGS_ARCH_PARAMS)
CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
.endif
-WERROR?= -Werror
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
+WERROR?= -Wno-error
+.else
+WERROR?= -Werror
+.endif
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}}
Modified: stable/12/sys/conf/kmod.mk
==============================================================================
--- stable/12/sys/conf/kmod.mk Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/conf/kmod.mk Mon Sep 9 18:27:52 2019 (r352094)
@@ -107,7 +107,12 @@ __KLD_SHARED=no
.if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
CFLAGS+= -fno-strict-aliasing
.endif
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
+WERROR?= -Wno-error
+.else
WERROR?= -Werror
+.endif
+
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
Modified: stable/12/sys/modules/linux/Makefile
==============================================================================
--- stable/12/sys/modules/linux/Makefile Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/modules/linux/Makefile Mon Sep 9 18:27:52 2019 (r352094)
@@ -55,7 +55,7 @@ linux${SFX}_assym.h: linux${SFX}_genassym.o
linux${SFX}_locore.o: linux${SFX}_assym.h assym.inc
${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s \
- -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib \
+ -pipe -I. -I${SYSDIR} ${WERROR} -Wall -fno-common -nostdinc -nostdlib \
-fno-omit-frame-pointer -fPIC \
-Wl,-T${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \
-Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-warn-common \
Modified: stable/12/sys/modules/linux64/Makefile
==============================================================================
--- stable/12/sys/modules/linux64/Makefile Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/modules/linux64/Makefile Mon Sep 9 18:27:52 2019 (r352094)
@@ -31,7 +31,7 @@ linux_assym.h: linux_genassym.o
linux_locore.o: linux_locore.s linux_assym.h
${CC} -x assembler-with-cpp -DLOCORE -shared -mcmodel=small \
- -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -fPIC -nostdinc \
+ -pipe -I. -I${SYSDIR} ${WERROR} -Wall -fno-common -fPIC -nostdinc \
-Wl,-T${SRCTOP}/sys/${MACHINE}/linux/${VDSO}.lds.s \
-Wl,-soname=${VDSO}.so.1,-warn-common -nostdlib \
${.IMPSRC} -o ${.TARGET}
Modified: stable/12/sys/powerpc/conf/MPC85XX
==============================================================================
--- stable/12/sys/powerpc/conf/MPC85XX Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/powerpc/conf/MPC85XX Mon Sep 9 18:27:52 2019 (r352094)
@@ -13,7 +13,6 @@ machine powerpc powerpc
include "dpaa/config.dpaa"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1
-makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
options FPU_EMU
Modified: stable/12/sys/powerpc/conf/MPC85XXSPE
==============================================================================
--- stable/12/sys/powerpc/conf/MPC85XXSPE Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/powerpc/conf/MPC85XXSPE Mon Sep 9 18:27:52 2019 (r352094)
@@ -13,7 +13,6 @@ machine powerpc powerpcspe
include "dpaa/config.dpaa"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1
-makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
options FPU_EMU
Modified: stable/12/sys/powerpc/conf/QORIQ64
==============================================================================
--- stable/12/sys/powerpc/conf/QORIQ64 Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/powerpc/conf/QORIQ64 Mon Sep 9 18:27:52 2019 (r352094)
@@ -14,7 +14,7 @@ machine powerpc powerpc64
include "dpaa/config.dpaa"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1
-makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
+#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
options FPU_EMU
Modified: stable/12/sys/powerpc/conf/dpaa/DPAA
==============================================================================
--- stable/12/sys/powerpc/conf/dpaa/DPAA Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/sys/powerpc/conf/dpaa/DPAA Mon Sep 9 18:27:52 2019 (r352094)
@@ -12,7 +12,7 @@ cpu BOOKE_E500
machine powerpc powerpc
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
+#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls"
makeoptions NO_MODULES=yes
# Platform support
Modified: stable/12/usr.sbin/pmcstudy/Makefile
==============================================================================
--- stable/12/usr.sbin/pmcstudy/Makefile Mon Sep 9 18:20:55 2019 (r352093)
+++ stable/12/usr.sbin/pmcstudy/Makefile Mon Sep 9 18:27:52 2019 (r352094)
@@ -4,7 +4,7 @@
PROG= pmcstudy
MAN= pmcstudy.8
SRCS= pmcstudy.c eval_expr.c
-CFLAGS+= -Wall -Werror
+CFLAGS+= -Wall ${WERROR}
BINDIR= /usr/bin
More information about the svn-src-stable-12
mailing list