Date: Sun, 25 Aug 2019 19:39:31 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351485 - in head/sys: arm/conf conf powerpc/conf powerpc/conf/dpaa Message-ID: <201908251939.x7PJdVq7034344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Aug 25 19:39:31 2019 New Revision: 351485 URL: https://svnweb.freebsd.org/changeset/base/351485 Log: Fix bogusly declared WERRORs in kernel build Many arm kernel configs bogusly specified WERROR=-Werror. There's no reason for this because the default is that and there's no reason to override. These date from a time when we needed to add additional warning->error suppression. They are obsolete and were cut and paste propagated from file to file. Comment out all the WERROR=.... lines in powerpc. They aren't bogus, but were appropriate for the old defaults for gcc4.2.1. Now that we've made the policy decision to suppress -Werror by default on these platforms, it is appropriate to comment these out. People wishing to fix these errors can still un-comment them out, or say WERROR=-Werror on the command line. Fix two instances (cut and paste propagation) of hard-coded -Werror in x86 code. Replace with ${WERROR} instead. This is a no-op change except for people who build WERROR=-Wno-error :). This should fix tinderbox / CI breakage. Modified: head/sys/arm/conf/ALPINE head/sys/arm/conf/ARMADA38X head/sys/arm/conf/ARMADAXP head/sys/arm/conf/DB-78XXX head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/RT1310 head/sys/arm/conf/SHEEVAPLUG head/sys/arm/conf/SOCFPGA head/sys/arm/conf/TS7800 head/sys/arm/conf/VYBRID head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/powerpc/conf/MPC85XX head/sys/powerpc/conf/MPC85XXSPE head/sys/powerpc/conf/QORIQ64 head/sys/powerpc/conf/dpaa/DPAA Modified: head/sys/arm/conf/ALPINE ============================================================================== --- head/sys/arm/conf/ALPINE Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/ALPINE Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/ARMADA38X ============================================================================== --- head/sys/arm/conf/ARMADA38X Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/ARMADA38X Sun Aug 25 19:39:31 2019 (r351485) @@ -11,7 +11,6 @@ ident ARMADA38X options SOC_MV_ARMADA38X -makeoptions WERROR="-Werror" makeoptions MODULES_EXTRA="dtb/mv" #options MD_ROOT Modified: head/sys/arm/conf/ARMADAXP ============================================================================== --- head/sys/arm/conf/ARMADAXP Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/ARMADAXP Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/DB-78XXX ============================================================================== --- head/sys/arm/conf/DB-78XXX Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/DB-78XXX Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/DB-88F5XXX Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/DB-88F6XXX Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/RT1310 ============================================================================== --- head/sys/arm/conf/RT1310 Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/RT1310 Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/SHEEVAPLUG ============================================================================== --- head/sys/arm/conf/SHEEVAPLUG Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/SHEEVAPLUG Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/SOCFPGA ============================================================================== --- head/sys/arm/conf/SOCFPGA Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/SOCFPGA Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/TS7800 ============================================================================== --- head/sys/arm/conf/TS7800 Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/TS7800 Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/arm/conf/VYBRID ============================================================================== --- head/sys/arm/conf/VYBRID Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/arm/conf/VYBRID Sun Aug 25 19:39:31 2019 (r351485) @@ -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 SMP # Enable multiple cores Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/conf/files.amd64 Sun Aug 25 19:39:31 2019 (r351485) @@ -50,7 +50,7 @@ linux32_assym.h optional compat_linux32 \ # linux32_locore.o optional compat_linux32 \ dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.asm" \ - 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: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/conf/files.i386 Sun Aug 25 19:39:31 2019 (r351485) @@ -37,7 +37,7 @@ linux_assym.h optional compat_linux \ # linux_locore.o optional compat_linux \ dependency "linux_assym.h $S/i386/linux/linux_locore.asm" \ - 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: head/sys/powerpc/conf/MPC85XX ============================================================================== --- head/sys/powerpc/conf/MPC85XX Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/powerpc/conf/MPC85XX Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/powerpc/conf/MPC85XXSPE ============================================================================== --- head/sys/powerpc/conf/MPC85XXSPE Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/powerpc/conf/MPC85XXSPE Sun Aug 25 19:39:31 2019 (r351485) @@ -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 options MAXCPU=2 Modified: head/sys/powerpc/conf/QORIQ64 ============================================================================== --- head/sys/powerpc/conf/QORIQ64 Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/powerpc/conf/QORIQ64 Sun Aug 25 19:39:31 2019 (r351485) @@ -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: head/sys/powerpc/conf/dpaa/DPAA ============================================================================== --- head/sys/powerpc/conf/dpaa/DPAA Sun Aug 25 19:27:14 2019 (r351484) +++ head/sys/powerpc/conf/dpaa/DPAA Sun Aug 25 19:39:31 2019 (r351485) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908251939.x7PJdVq7034344>