On Wed, Dec 28, 2022 at 02:36:56PM -0700, Todd C. Miller wrote:
> OK millert@ as well. There is no point in trying to fix this locally
> when upstream zlib will be changing it in the near(?) future.
>
> - todd
tb updated us to the newer version a while ago
diff --git sys/arch/amd64/conf/Makefile.amd64 sys/arch/amd64/conf/Makefile.amd64
index 6f760b174bb..e246d883a63 100644
--- sys/arch/amd64/conf/Makefile.amd64
+++ sys/arch/amd64/conf/Makefile.amd64
@@ -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 sys/arch/amd64/stand/Makefile.inc sys/arch/amd64/stand/Makefile.inc
index d423cae6555..e37f23005d6 100644
--- sys/arch/amd64/stand/Makefile.inc
+++ sys/arch/amd64/stand/Makefile.inc
@@ -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 sys/arch/arm64/conf/Makefile.arm64 sys/arch/arm64/conf/Makefile.arm64
index 1719e3d045d..1149af714a8 100644
--- sys/arch/arm64/conf/Makefile.arm64
+++ sys/arch/arm64/conf/Makefile.arm64
@@ -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 sys/arch/arm64/stand/efiboot/Makefile
sys/arch/arm64/stand/efiboot/Makefile
index fbd86b1c292..216a9a98b7c 100644
--- sys/arch/arm64/stand/efiboot/Makefile
+++ sys/arch/arm64/stand/efiboot/Makefile
@@ -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 sys/arch/armv7/conf/Makefile.armv7 sys/arch/armv7/conf/Makefile.armv7
index 78944a7d74d..30d2aea8d7e 100644
--- sys/arch/armv7/conf/Makefile.armv7
+++ sys/arch/armv7/conf/Makefile.armv7
@@ -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 sys/arch/armv7/stand/efiboot/Makefile
sys/arch/armv7/stand/efiboot/Makefile
index f769148f6ae..907d21e7a8e 100644
--- sys/arch/armv7/stand/efiboot/Makefile
+++ sys/arch/armv7/stand/efiboot/Makefile
@@ -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 sys/arch/i386/conf/Makefile.i386 sys/arch/i386/conf/Makefile.i386
index 77b2bb5540e..ddc752aa3bc 100644
--- sys/arch/i386/conf/Makefile.i386
+++ sys/arch/i386/conf/Makefile.i386
@@ -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 sys/arch/i386/stand/Makefile.inc sys/arch/i386/stand/Makefile.inc
index d9898462e50..ca6c22b84f3 100644
--- sys/arch/i386/stand/Makefile.inc
+++ sys/arch/i386/stand/Makefile.inc
@@ -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 sys/arch/loongson/conf/Makefile.loongson
sys/arch/loongson/conf/Makefile.loongson
index 043476631f0..afc9d392654 100644
--- sys/arch/loongson/conf/Makefile.loongson
+++ sys/arch/loongson/conf/Makefile.loongson
@@ -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 sys/arch/macppc/conf/Makefile.macppc
sys/arch/macppc/conf/Makefile.macppc
index 597f4a9963b..e58d287e827 100644
--- sys/arch/macppc/conf/Makefile.macppc
+++ sys/arch/macppc/conf/Makefile.macppc
@@ -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 sys/arch/octeon/conf/Makefile.octeon
sys/arch/octeon/conf/Makefile.octeon
index e43afc0b67e..df5e4657331 100644
--- sys/arch/octeon/conf/Makefile.octeon
+++ sys/arch/octeon/conf/Makefile.octeon
@@ -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 sys/arch/powerpc64/conf/Makefile.powerpc64
sys/arch/powerpc64/conf/Makefile.powerpc64
index 8df0915ebb3..50e13c88d80 100644
--- sys/arch/powerpc64/conf/Makefile.powerpc64
+++ sys/arch/powerpc64/conf/Makefile.powerpc64
@@ -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 sys/arch/riscv64/conf/Makefile.riscv64
sys/arch/riscv64/conf/Makefile.riscv64
index 5534eefb72f..502ec9662e3 100644
--- sys/arch/riscv64/conf/Makefile.riscv64
+++ sys/arch/riscv64/conf/Makefile.riscv64
@@ -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 sys/arch/riscv64/stand/efiboot/Makefile
sys/arch/riscv64/stand/efiboot/Makefile
index 412de038b45..b7f193207d4 100644
--- sys/arch/riscv64/stand/efiboot/Makefile
+++ sys/arch/riscv64/stand/efiboot/Makefile
@@ -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 sys/arch/sparc64/conf/Makefile.sparc64
sys/arch/sparc64/conf/Makefile.sparc64
index ade1835350f..ae19c5f1b24 100644
--- sys/arch/sparc64/conf/Makefile.sparc64
+++ sys/arch/sparc64/conf/Makefile.sparc64
@@ -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
