diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-09-06 01:47:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-09-06 01:47:39 +0000 |
| commit | a058b6ff5a29c5d6694c24610e512e74da3f7e51 (patch) | |
| tree | f4db3357f937c68a2befff7a8951571a55996474 /sys/arch/i386 | |
| parent | 9b3a0a3ebd3f3e9f05624e893769d257a850aadc (diff) | |
revert disabling warnings for zlib on clang >= 15
no longer needed with zlib 1.3
ok tb@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/Makefile.inc | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 77b2bb5540e..f2c1079de39 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.143 2022/12/30 06:44:36 jca Exp $ +# $OpenBSD: Makefile.i386,v 1.144 2023/09/06 01:47:37 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -46,9 +46,6 @@ CMACHFLAGS+= -mretpoline NO_INTEGR_AS= -no-integrated-as CWARNFLAGS+= -Wno-address-of-packed-member -Wno-constant-conversion \ -Wno-unused-but-set-variable -Wno-gnu-folding-constant -# XXX Workaround for zlib + clang 15 -# https://github.com/madler/zlib/issues/633 -CWARNFLAGS+= -Wno-deprecated-non-prototype -Wno-unknown-warning-option .endif DEBUG?= -g diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index d9898462e50..2ac5c017d01 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.54 2023/02/23 19:48:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.55 2023/09/06 01:47:37 jsg Exp $ CFLAGS=${DEBUG} ${COPTS} -Oz -Wall -Werror CFLAGS+= -ffreestanding -fno-stack-protector -DMDRANDOM -DBOOT_STTY @@ -25,9 +25,6 @@ SACFLAGS+=-nostdinc -fno-builtin -fpack-struct .include <bsd.own.mk> .if ${COMPILER_VERSION:Mclang} -# XXX Workaround for zlib + clang 15 -# https://github.com/madler/zlib/issues/633 -CFLAGS+= -Wno-deprecated-non-prototype -Wno-unknown-warning-option NO_INTEGR_AS= -no-integrated-as .endif |