summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2024-06-30 18:17:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2024-06-30 18:17:11 +0000
commitf4796f4661369972ccb513e5a88d8d84b1dec0e4 (patch)
treee28cda42667c147892cdb186fa4620fcee884c1b /sys
parenta1cc248fe949625cb503a288359f1fdc7f2805f7 (diff)
we don't need the NOBYFOUR space-savings option anymore, that codepath
was replaced a while ago. ok tb
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/stand/boot/Makefile4
-rw-r--r--sys/arch/amd64/stand/cdboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/efiboot/Makefile.common4
-rw-r--r--sys/arch/amd64/stand/pxeboot/Makefile4
-rw-r--r--sys/arch/arm64/stand/efiboot/Makefile4
-rw-r--r--sys/arch/armv7/stand/efiboot/Makefile4
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
-rw-r--r--sys/arch/i386/stand/cdboot/Makefile4
-rw-r--r--sys/arch/i386/stand/pxeboot/Makefile4
-rw-r--r--sys/arch/riscv64/stand/efiboot/Makefile4
-rw-r--r--sys/lib/libz/Makefile4
-rw-r--r--sys/lib/libz/zutil.h1
12 files changed, 22 insertions, 23 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 99d1e453033..7ca2c2e10be 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2023/04/17 00:05:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.50 2024/06/30 18:17:09 deraadt Exp $
COPTS?=
MAN?= boot.8
@@ -79,7 +79,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
.endif
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-DHIBERNATE
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} -I${S}/stand/boot #-DCOMPAT_UFS
CFLAGS+=-m32 $(SACFLAGS) -D__INTERNAL_LIBSA_CREAD -fno-pie
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index e16154f83fb..c643a10778a 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2023/04/17 00:05:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.45 2024/06/30 18:17:09 deraadt Exp $
MAN= cdboot.8
@@ -62,7 +62,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
CPPFLAGS+=-DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-I${S}/stand/boot
CFLAGS+=-m32
CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
diff --git a/sys/arch/amd64/stand/efiboot/Makefile.common b/sys/arch/amd64/stand/efiboot/Makefile.common
index 8421a2b4332..436a77d0391 100644
--- a/sys/arch/amd64/stand/efiboot/Makefile.common
+++ b/sys/arch/amd64/stand/efiboot/Makefile.common
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.common,v 1.23 2024/04/25 18:31:49 kn Exp $
+# $OpenBSD: Makefile.common,v 1.24 2024/06/30 18:17:09 deraadt Exp $
S= ${.CURDIR}/../../../../..
SADIR= ${.CURDIR}/../..
@@ -70,7 +70,7 @@ ${PROG}: ${PROG.so}
.include <bsd.prog.mk>
CFLAGS+= -Wno-pointer-sign
-CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
+CPPFLAGS+= -DSMALL -DSLOW -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DHEAP_LIMIT=${EFI_HEAP_LIMIT} -DHIBERNATE
${PROG.so}: ${OBJS}
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index f718fb6e633..8a3ffa4b309 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2023/04/17 00:05:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.43 2024/06/30 18:17:09 deraadt Exp $
MAN= pxeboot.8
@@ -69,7 +69,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} -I${S}/stand/boot #-DCOMPAT_UFS
CFLAGS+=-m32
CFLAGS+=$(SACFLAGS) -D__INTERNAL_LIBSA_CREAD -fno-pie
diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile
index 93e0ce63964..6773d87848f 100644
--- a/sys/arch/arm64/stand/efiboot/Makefile
+++ b/sys/arch/arm64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2023/10/26 14:13:37 jsg Exp $
+# $OpenBSD: Makefile,v 1.23 2024/06/30 18:17:09 deraadt Exp $
NOMAN= #
@@ -47,7 +47,7 @@ CPPFLAGS+= -nostdinc
CPPFLAGS+= -I${S} -I. -I${.CURDIR}
CPPFLAGS+= -I${EFIDIR}/include -I${EFIDIR}/include/arm64
CPPFLAGS+= -D_STANDALONE -DBOOT_STTY
-CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
+CPPFLAGS+= -DSMALL -DSLOW -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DNEEDS_HEAP_H -DMDRANDOM -DFWRANDOM
COPTS+= -Wno-attributes -Wno-format
COPTS+= -ffreestanding -fno-stack-protector
diff --git a/sys/arch/armv7/stand/efiboot/Makefile b/sys/arch/armv7/stand/efiboot/Makefile
index a549b9802d1..0ef8555c8ce 100644
--- a/sys/arch/armv7/stand/efiboot/Makefile
+++ b/sys/arch/armv7/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2023/09/06 01:47:37 jsg Exp $
+# $OpenBSD: Makefile,v 1.21 2024/06/30 18:17:09 deraadt Exp $
NOMAN= #
@@ -45,7 +45,7 @@ CPPFLAGS+= -nostdinc
CPPFLAGS+= -I${S} -I. -I${.CURDIR}
CPPFLAGS+= -I${EFIDIR}/include -I${EFIDIR}/include/arm
CPPFLAGS+= -D_STANDALONE -DBOOT_STTY
-CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
+CPPFLAGS+= -DSMALL -DSLOW -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DNEEDS_HEAP_H
COPTS+= -ffreestanding -fno-stack-protector
COPTS+= -fshort-wchar -fPIC -fno-builtin
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 8672157ddf3..20534e026e3 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2021/07/08 20:04:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.76 2024/06/30 18:17:09 deraadt Exp $
COPTS?=
MAN?= boot.8
@@ -83,7 +83,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
.endif
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-DHIBERNATE
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} -I${S}/stand/boot #-DCOMPAT_UFS
CFLAGS+=-m32 $(SACFLAGS) -D__INTERNAL_LIBSA_CREAD -fno-pie
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index cb575139010..6d748c28309 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2021/07/08 20:04:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.40 2024/06/30 18:17:09 deraadt Exp $
MAN= cdboot.8
@@ -68,7 +68,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
CPPFLAGS+=-DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-I${S}/stand/boot
CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
CFLAGS+=-DOSREV=\"${OSREV}\" -DMACHINE=\"${MACHINE}\"
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index 52611e2cea0..202181b1c05 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2021/07/08 20:04:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.37 2024/06/30 18:17:09 deraadt Exp $
MAN= pxeboot.8
@@ -69,7 +69,7 @@ NOPROG=
CPPFLAGS+=-DSOFTRAID
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
-CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
+CPPFLAGS+=-DSLOW -DSMALL -DNO_GZIP -DDYNAMIC_CRC_TABLE -DBUILDFIXED
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT}
CPPFLAGS+=-I${S}/stand/boot
CFLAGS+=$(SACFLAGS) -D__INTERNAL_LIBSA_CREAD -fno-pie
diff --git a/sys/arch/riscv64/stand/efiboot/Makefile b/sys/arch/riscv64/stand/efiboot/Makefile
index 4ebfe813455..4a4f9c9de4b 100644
--- a/sys/arch/riscv64/stand/efiboot/Makefile
+++ b/sys/arch/riscv64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2024/03/26 22:26:04 kettenis Exp $
+# $OpenBSD: Makefile,v 1.8 2024/06/30 18:17:10 deraadt Exp $
NOMAN= #
@@ -47,7 +47,7 @@ CPPFLAGS+= -nostdinc
CPPFLAGS+= -I${S} -I. -I${.CURDIR}
CPPFLAGS+= -I${EFIDIR}/include -I${EFIDIR}/include/riscv64
CPPFLAGS+= -D_STANDALONE -DBOOT_STTY
-CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
+CPPFLAGS+= -DSMALL -DSLOW -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DNEEDS_HEAP_H -DFWRANDOM
CPPFLAGS+= -march=rv64gc --target=riscv64 -mno-relax
COPTS+= -Wno-attributes -Wno-format
diff --git a/sys/lib/libz/Makefile b/sys/lib/libz/Makefile
index 960543d33d9..c7274865b94 100644
--- a/sys/lib/libz/Makefile
+++ b/sys/lib/libz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2021/07/08 20:02:42 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2024/06/30 18:17:10 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1997/01/22 01:36:30 cgd Exp $
LIB= z
@@ -6,7 +6,7 @@ NOPIC=
NOPROFILE=
# Tweak knobs to generate small libz code
-CPPFLAGS+= -DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP
+CPPFLAGS+= -DSLOW -DSMALL -DNO_GZIP
CPPFLAGS+= -I. ${ZCPPFLAGS}
# files to be copied down from libz.
diff --git a/sys/lib/libz/zutil.h b/sys/lib/libz/zutil.h
index 583354ed14f..4995480cdea 100644
--- a/sys/lib/libz/zutil.h
+++ b/sys/lib/libz/zutil.h
@@ -24,7 +24,6 @@
#include <sys/systm.h>
#define MY_ZCALLOC
-#define NOBYFOUR
typedef long ptrdiff_t;
#else
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 20:58:51 +0000