revert disabling warnings for zlib on clang >= 15

no longer needed with zlib 1.3
ok tb@

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 6f760b1..8183af3 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.133 2023/07/31 04:01:07 guenther Exp $
+#      $OpenBSD: Makefile.amd64,v 1.134 2023/09/06 01:47:36 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -78,9 +78,6 @@ CMACHFLAGS+=  -mretpoline-external-thunk -fcf-protection=branch
 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/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc
index d423cae..3f5ce74 100644 (file)
--- a/sys/arch/amd64/stand/Makefile.inc
+++ b/sys/arch/amd64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.21 2023/02/23 19:48:21 miod Exp $
+#      $OpenBSD: Makefile.inc,v 1.22 2023/09/06 01:47:36 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
 

diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index 1719e3d..636b7b4 100644 (file)
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.arm64,v 1.46 2023/04/09 19:48:37 kettenis Exp $
+#      $OpenBSD: Makefile.arm64,v 1.47 2023/09/06 01:47:36 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -55,9 +55,6 @@ CWARNFLAGS=   -Werror -Wall -Wimplicit-function-declaration \
                -Wno-constant-conversion -Wno-address-of-packed-member \
                -Wno-unused-but-set-variable -Wno-gnu-folding-constant \
                -Wframe-larger-than=2047
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-CWARNFLAGS+=   -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 CMACHFLAGS=    -march=armv8-a+nofp+nosimd \
                -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer \

diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile
index fbd86b1..48c5132 100644 (file)
--- a/sys/arch/arm64/stand/efiboot/Makefile
+++ b/sys/arch/arm64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.20 2023/03/05 16:21:52 kettenis Exp $
+#      $OpenBSD: Makefile,v 1.21 2023/09/06 01:47:36 jsg Exp $
 
 NOMAN=         #
 
@@ -53,9 +53,6 @@ COPTS+=               -Wno-attributes -Wno-format
 COPTS+=                -ffreestanding -fno-stack-protector
 COPTS+=                -fshort-wchar -fPIC -fno-builtin
 COPTS+=                -Wall -Werror
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-COPTS+=                -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 PROG.elf=      ${PROG:S/.EFI/.elf/}
 CLEANFILES+=   ${PROG.elf} ${PROG.elf}.tmp

diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 78944a7..470107e 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.53 2022/12/30 06:44:35 jca Exp $
+#      $OpenBSD: Makefile.armv7,v 1.54 2023/09/06 01:47:36 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -28,9 +28,6 @@ CWARNFLAGS=   -Werror -Wall -Wimplicit-function-declaration \
                -Wno-constant-conversion -Wno-address-of-packed-member \
                -Wno-unused-but-set-variable -Wno-gnu-folding-constant \
                -Wframe-larger-than=2047
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-CWARNFLAGS+=   -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 CMACHFLAGS=    -msoft-float -march=armv7a
 CMACHFLAGS+=   -ffreestanding ${NOPIE_FLAGS}

diff --git a/sys/arch/armv7/stand/efiboot/Makefile b/sys/arch/armv7/stand/efiboot/Makefile
index f769148..a549b98 100644 (file)
--- a/sys/arch/armv7/stand/efiboot/Makefile
+++ b/sys/arch/armv7/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.19 2023/02/23 19:48:22 miod Exp $
+#      $OpenBSD: Makefile,v 1.20 2023/09/06 01:47:37 jsg Exp $
 
 NOMAN=         #
 
@@ -51,9 +51,6 @@ COPTS+=               -ffreestanding -fno-stack-protector
 COPTS+=                -fshort-wchar -fPIC -fno-builtin
 COPTS+=                -Wall -Werror
 COPTS+=                -mfloat-abi=soft
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-COPTS+=                -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 PROG.elf=      ${PROG:S/.EFI/.elf/}
 CLEANFILES+=   ${PROG.elf} ${PROG.elf}.tmp

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 77b2bb5..f2c1079 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.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 d989846..2ac5c01 100644 (file)
--- 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
 

diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 0434766..bb896fc 100644 (file)
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.loongson,v 1.83 2022/12/30 06:44:36 jca Exp $
+#      $OpenBSD: Makefile.loongson,v 1.84 2023/09/06 01:47:37 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -51,9 +51,6 @@ NO_INTEGR_AS= -no-integrated-as
 CMACHFLAGS+=   -fomit-frame-pointer
 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/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 597f4a9..091c5dc 100644 (file)
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.macppc,v 1.105 2022/12/30 06:44:36 jca Exp $
+#      $OpenBSD: Makefile.macppc,v 1.106 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 @@ COPTIMIZE?=   -Oz
 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/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index e43afc0..ab617f9 100644 (file)
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.octeon,v 1.62 2022/12/30 06:44:36 jca Exp $
+#      $OpenBSD: Makefile.octeon,v 1.63 2023/09/06 01:47:37 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -49,9 +49,6 @@ NO_INTEGR_AS= -no-integrated-as
 CMACHFLAGS+=   -fomit-frame-pointer
 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/powerpc64/conf/Makefile.powerpc64 b/sys/arch/powerpc64/conf/Makefile.powerpc64
index 8df0915..63637cf 100644 (file)
--- a/sys/arch/powerpc64/conf/Makefile.powerpc64
+++ b/sys/arch/powerpc64/conf/Makefile.powerpc64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.powerpc64,v 1.15 2023/01/01 01:34:33 jsg Exp $
+#      $OpenBSD: Makefile.powerpc64,v 1.16 2023/09/06 01:47:37 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -55,9 +55,6 @@ CWARNFLAGS=   -Werror -Wall -Wimplicit-function-declaration \
                -Wno-constant-conversion -Wno-address-of-packed-member \
                -Wno-unused-but-set-variable -Wno-gnu-folding-constant \
                -Wframe-larger-than=2047
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-CWARNFLAGS+=   -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 CMACHFLAGS=    -mabi=elfv2 -msoft-float -mno-altivec -mno-vsx
 CMACHFLAGS+=   -ffreestanding

diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index 5534eef..3f0a37d 100644 (file)
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.riscv64,v 1.16 2022/12/30 06:44:36 jca Exp $
+#      $OpenBSD: Makefile.riscv64,v 1.17 2023/09/06 01:47:37 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -30,9 +30,6 @@ CWARNFLAGS=   -Werror -Wall -Wimplicit-function-declaration \
                -Wno-constant-conversion -Wno-address-of-packed-member \
                -Wno-unused-but-set-variable -Wno-gnu-folding-constant \
                -Wframe-larger-than=2047
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-CWARNFLAGS+=   -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 CMACHFLAGS=    -march=rv64gc -mcmodel=medany -mno-relax \
                -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer

diff --git a/sys/arch/riscv64/stand/efiboot/Makefile b/sys/arch/riscv64/stand/efiboot/Makefile
index 412de03..e0daecf 100644 (file)
--- a/sys/arch/riscv64/stand/efiboot/Makefile
+++ b/sys/arch/riscv64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2023/02/23 19:48:22 miod Exp $
+#      $OpenBSD: Makefile,v 1.6 2023/09/06 01:47:37 jsg Exp $
 
 NOMAN=         #
 
@@ -54,9 +54,6 @@ COPTS+=               -Wno-attributes -Wno-format
 COPTS+=                -ffreestanding -fno-stack-protector
 COPTS+=                -fshort-wchar -fPIC -fno-builtin
 COPTS+=                -Wall -Werror
-# XXX Workaround for zlib + clang 15
-# https://github.com/madler/zlib/issues/633
-COPTS+=                -Wno-deprecated-non-prototype -Wno-unknown-warning-option
 
 PROG.elf=      ${PROG:S/.EFI/.elf/}
 CLEANFILES+=   ${PROG.elf} ${PROG.elf}.tmp

diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index ade1835..fc39914 100644 (file)
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.sparc64,v 1.105 2022/12/30 06:44:36 jca Exp $
+#      $OpenBSD: Makefile.sparc64,v 1.106 2023/09/06 01:47:38 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -47,9 +47,6 @@ COPTIMIZE?=   -Oz
 CWARNFLAGS+=   -Wno-unused-command-line-argument
 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