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/riscv64 | |
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/riscv64')
-rw-r--r-- | sys/arch/riscv64/conf/Makefile.riscv64 | 5 | ||||
-rw-r--r-- | sys/arch/riscv64/stand/efiboot/Makefile | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64 index 5534eefb72f..3f0a37d69ee 100644 --- 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 412de038b45..e0daecf447d 100644 --- 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 |