sync with OpenBSD -current
This commit is contained in:
parent
1093aeaee4
commit
f5750f4f6e
GPG key ID:
F42C07F07E2E35B7
42 changed files with 42 additions and 9497 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}\"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <sys/systm.h>
|
||||
|
||||
#define MY_ZCALLOC
|
||||
#define NOBYFOUR
|
||||
|
||||
typedef long ptrdiff_t;
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue