Move -Wno-address-of-packed-member to the clang block as well and sync

armv7 and i386 with amd64.

ok guenther@

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 852a3fa..e7a3f45 100644 (file)
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.amd64,v 1.103 2018/09/11 15:52:00 guenther Exp $
+#      $OpenBSD: Makefile.amd64,v 1.104 2018/09/12 04:34:59 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -25,7 +25,6 @@ INCLUDES=     -nostdinc -I$S -I${.OBJDIR} -I$S/arch
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
 CWARNFLAGS=    -Werror -Wall -Wimplicit-function-declaration \
                -Wno-uninitialized -Wno-pointer-sign \
-               -Wno-address-of-packed-member \
                -Wframe-larger-than=2047
 
 CMACHFLAGS=    -mcmodel=kernel -mno-red-zone -mno-sse2 -mno-sse -mno-3dnow \
@@ -45,7 +44,7 @@ CMACHFLAGS+=  -mretpoline
 .endif
 .if ${COMPILER_VERSION:Mclang}
 NO_INTEGR_AS=  -no-integrated-as
-CWARNFLAGS+=   -Wno-constant-conversion
+CWARNFLAGS+=   -Wno-address-of-packed-member -Wno-constant-conversion
 .endif
 
 DEBUG?=                -g

diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index fe0564e..f6155dc 100644 (file)
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.armv7,v 1.40 2018/02/10 06:52:47 patrick Exp $
+#      $OpenBSD: Makefile.armv7,v 1.41 2018/09/12 04:34:59 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -25,7 +25,6 @@ INCLUDES=     -nostdinc -I$S -I. -I$S/arch
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
 CWARNFLAGS=    -Werror -Wall -Wimplicit-function-declaration \
                -Wno-uninitialized -Wno-pointer-sign \
-               -Wno-address-of-packed-member -Wno-constant-conversion \
                -Wframe-larger-than=2047
 
 CMACHFLAGS=    -msoft-float
@@ -44,6 +43,7 @@ SORTR=                cat
 .endif
 .if ${COMPILER_VERSION:Mclang}
 NO_INTEGR_AS=  -no-integrated-as
+CWARNFLAGS+=   -Wno-address-of-packed-member -Wno-constant-conversion
 .endif
 
 DEBUG?=                -g

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 18b7a98..f6d7a0f 100644 (file)
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.i386,v 1.126 2018/08/21 18:06:12 anton Exp $
+#      $OpenBSD: Makefile.i386,v 1.127 2018/09/12 04:34:59 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -25,7 +25,6 @@ INCLUDES=     -nostdinc -I$S -I${.OBJDIR} -I$S/arch
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP
 CWARNFLAGS=    -Werror -Wall -Wimplicit-function-declaration \
                -Wno-uninitialized -Wno-pointer-sign \
-               -Wno-address-of-packed-member -Wno-constant-conversion \
                -Wframe-larger-than=2047
 
 CMACHFLAGS=
@@ -36,11 +35,12 @@ CMACHFLAGS+=        -fno-stack-protector
 .endif
 .if ${IDENT:M-DSMALL_KERNEL}
 SORTR=         cat
-.else
+.elif ${COMPILER_VERSION:Mclang}
 CMACHFLAGS+=   -mretpoline
 .endif
 .if ${COMPILER_VERSION:Mclang}
 NO_INTEGR_AS=  -no-integrated-as
+CWARNFLAGS+=   -Wno-address-of-packed-member -Wno-constant-conversion
 .endif
 
 DEBUG?=                -g