From 981798c331286a54f841379ea9d4facff47bd0a2 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 4 Jan 2023 13:01:46 +0000 Subject: [PATCH] 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 --- sys/arch/arm64/stand/efiboot/Makefile | 4 ++-- sys/arch/riscv64/stand/efiboot/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile index 9c41afa2a51..64a31a99cea 100644 --- 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 85b3f9c2db8..7d53b14cbd8 100644 --- 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 -- 2.20.1