experiments for --execute-only on arm64 and riscv64 are going well,

which will prompt making that the default.  That means efiboot, which
build in a different way, must disable the link option.
ok kettenis

diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile
index 9c41afa..64a31a9 100644 (file)
--- a/sys/arch/arm64/stand/efiboot/Makefile
+++ b/sys/arch/arm64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.18 2022/12/30 06:44:35 jca Exp $
+#      $OpenBSD: Makefile,v 1.19 2023/01/04 13:01:46 deraadt Exp $
 
 NOMAN=         #
 
@@ -19,7 +19,7 @@ OBJCOPY?=     objcopy
 OBJDUMP?=      objdump
 
 LDFLAGS+=-nostdlib -T ${.CURDIR}/ldscript.arm64 -Bsymbolic -shared
-LDFLAGS+=--pack-dyn-relocs=none
+LDFLAGS+=--pack-dyn-relocs=none --no-execute-only
 
 .PATH: ${S}/stand/boot
 SRCS+= boot.c cmd.c vars.c

diff --git a/sys/arch/riscv64/stand/efiboot/Makefile b/sys/arch/riscv64/stand/efiboot/Makefile
index 85b3f9c..7d53b14 100644 (file)
--- a/sys/arch/riscv64/stand/efiboot/Makefile
+++ b/sys/arch/riscv64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2022/12/30 06:44:35 jca Exp $
+#      $OpenBSD: Makefile,v 1.4 2023/01/04 13:01:47 deraadt Exp $
 
 NOMAN=         #
 
@@ -19,7 +19,7 @@ OBJCOPY?=     objcopy
 OBJDUMP?=      objdump
 
 LDFLAGS+=-nostdlib -T ${.CURDIR}/ldscript.riscv64 -Bsymbolic -shared
-LDFLAGS+=--pack-dyn-relocs=none
+LDFLAGS+=--pack-dyn-relocs=none --no-execute-only
 
 .PATH: ${S}/stand/boot
 SRCS+= boot.c cmd.c vars.c