with llvm22, -Ttext also requires --image-base to be specified

with robert@

sys/arch/amd64/stand/biosboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2018/10/16 18:20:58 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.15 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	biosboot.8
 
@@ -9,7 +9,7 @@ SADIR=	${.CURDIR}/..
 PROG=	biosboot
 SRCS=	biosboot.S
 LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext 0 --image-base=0 -N -x -Bstatic -nopie -znorelro
 LDFLAGS+=-T ${.CURDIR}/ld.script
 LDFLAGS+=-melf_i386 -L/usr/libdata
 INSTALL_STRIP=

sys/arch/amd64/stand/boot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.50 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.51 2026/05/28 16:35:12 naddy Exp $
 
 COPTS?=
 MAN?=	boot.8
@@ -18,7 +18,7 @@ SRCS=	srt0.S conf.c
 LD?=	ld
 SIZE?=	size
 AFLAGS+=-Dendbr64=
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie -znorelro
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) --image-base=$(LINKADDR) -N -x -nopie -znorelro
 LDFLAGS+=-melf_i386 -L/usr/libdata
 
 .PATH:	${S}/stand/boot

sys/arch/amd64/stand/cdboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.45 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.46 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	cdboot.8
 
@@ -11,7 +11,7 @@ SRCS=	srt0.S boot.c conf.c
 LD?=	ld
 SIZE?=	size
 AFLAGS+=-Dendbr64=
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie -znorelro
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) --image-base $(LINKADDR) -N -x -nopie -znorelro
 LDFLAGS+=-melf_i386 -L/usr/libdata
 INSTALL_STRIP=
 BINMODE=644

sys/arch/amd64/stand/cdbr/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2016/07/30 03:25:48 guenther Exp $
+#	$OpenBSD: Makefile,v 1.12 2026/05/28 16:35:12 naddy Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -13,7 +13,7 @@ AFLAGS+=-DMACH=\"${MACHINE}\" -DMACH_U=\"${MACHINE:U}\"
 AFLAGS+=-fno-pie
 LD=ld
 ORG=	0x0000
-LDFLAGS=-nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext ${ORG} --image-base=${ORG} -x -N -s -Bstatic -e start -nopie -znorelro
 LDFLAGS+=-melf_i386 -L/usr/libdata
 INSTALL_STRIP=
 BINMODE=644

sys/arch/amd64/stand/mbr/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2017/10/17 19:31:56 naddy Exp $
+#	$OpenBSD: Makefile,v 1.13 2026/05/28 16:35:12 naddy Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -10,7 +10,7 @@ AFLAGS+=-m32
 AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
 AFLAGS+=-fno-pie
 LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext 0 --image-base=0 -x -N -s -Bstatic -e start -nopie -znorelro
 LDFLAGS+=-melf_i386 -L/usr/libdata
 
 NOMAN=

sys/arch/amd64/stand/pxeboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.43 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.44 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	pxeboot.8
 
@@ -11,7 +11,7 @@ SRCS=	srt0.S conf.c devopen.c open.c
 LD?=	ld
 SIZE?=	size
 AFLAGS+=-Dendbr64=
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie -znorelro
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) --image-base=$(LINKADDR) -N -x -nopie -znorelro
 LDFLAGS+=-melf_i386 -L/usr/libdata
 INSTALL_STRIP=
 BINMODE=644

sys/arch/i386/stand/biosboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2018/10/16 18:20:58 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.31 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	biosboot.8
 
@@ -9,7 +9,7 @@ SADIR=	${.CURDIR}/..
 PROG=	biosboot
 SRCS=	biosboot.S
 LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext 0 --image-base=0 -N -x -Bstatic -nopie -znorelro
 LDFLAGS+=-T ${.CURDIR}/ld.script
 INSTALL_STRIP=
 

sys/arch/i386/stand/boot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.76 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.77 2026/05/28 16:35:12 naddy Exp $
 
 COPTS?=
 MAN?=	boot.8
@@ -20,7 +20,7 @@ LDFLAGS+=-nostdlib -Bstatic -nopie -znorelro
 
 CLEANFILES+=	crt0.o
 SRCS=	srt0.S conf.c
-LDFLAGS+=-Ttext $(LINKADDR) -N -x
+LDFLAGS+=-Ttext $(LINKADDR) --image-base=$(LINKADDR) -N -x
 
 .PATH:	${S}/stand/boot
 SRCS+=	boot.c bootarg.c cmd.c vars.c

sys/arch/i386/stand/cdboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.40 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.41 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	cdboot.8
 
@@ -10,7 +10,7 @@ PROG=	cdboot
 SRCS=	srt0.S boot.c conf.c
 LD?=	ld
 SIZE?=	size
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie -znorelro
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) --image-base=$(LINKADDR) -N -x -nopie -znorelro
 INSTALL_STRIP=
 BINMODE=644
 

sys/arch/i386/stand/cdbr/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2016/07/30 03:25:48 guenther Exp $
+#	$OpenBSD: Makefile,v 1.8 2026/05/28 16:35:12 naddy Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -12,7 +12,7 @@ AFLAGS+=-DMACH=\"${MACHINE}\" -DMACH_U=\"${MACHINE:U}\"
 AFLAGS+=-fno-pie
 LD=ld
 ORG=	0x0000
-LDFLAGS=-nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext ${ORG} --image-base=${ORG} -x -N -s -Bstatic -e start -nopie -znorelro
 
 NOMAN=
 #MAN+=	cdbr.8

sys/arch/i386/stand/mbr/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2017/10/17 19:31:56 naddy Exp $
+#	$OpenBSD: Makefile,v 1.22 2026/05/28 16:35:12 naddy Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -9,7 +9,7 @@ SRCS=	mbr.S
 AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
 AFLAGS+=-fno-pie
 LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start -nopie -znorelro
+LDFLAGS=-nostdlib -Ttext 0 --image-base=0 -x -N -s -Bstatic -e start -nopie -znorelro
 
 NOMAN=
 #MAN+=	mbr.8

sys/arch/i386/stand/pxeboot/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2024/06/30 18:17:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.38 2026/05/28 16:35:12 naddy Exp $
 
 MAN=	pxeboot.8
 
@@ -10,7 +10,7 @@ PROG=	pxeboot
 SRCS=	srt0.S conf.c devopen.c open.c
 LD?=	ld
 SIZE?=	size
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie -znorelro
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) --image-base=$(LINKADDR) -N -x -nopie -znorelro
 INSTALL_STRIP=
 BINMODE=644