summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2018-10-13 19:56:57 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2018-10-13 19:56:57 +0000
commitec745864fe884fa5b18ad29bdaed9154aa97dc1e (patch)
tree8bd280cb007a21bcd93502ba2f029a8ebccb7865 /sys/arch/amd64
parent22aa733009ebe848ea81335f9a76d0734738fa59 (diff)
Tweak linker flags and objcopy invocation to make things build with lld.
BOOTIA32.EFI works but BOOTX64.EFI unfortunately doesn't work yet. ok patrick@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/stand/efiboot/Makefile.common4
-rw-r--r--sys/arch/amd64/stand/efiboot/bootia32/Makefile3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/amd64/stand/efiboot/Makefile.common b/sys/arch/amd64/stand/efiboot/Makefile.common
index 25c7a8f1e65..e13d67ae98d 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.12 2017/11/25 19:02:07 patrick Exp $
+# $OpenBSD: Makefile.common,v 1.13 2018/10/13 19:56:56 kettenis Exp $
S= ${.CURDIR}/../../../../..
SADIR= ${.CURDIR}/../..
@@ -62,7 +62,7 @@ CLEANFILES+= ${PROG.so} ${PROG.so}.tmp
${PROG}: ${PROG.so}
${OBJCOPY} -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
- -j .rel.* -j .rela -j .rela.* -j .reloc \
+ -j .rel.dyn -j .rela -j .rela.dyn -j .reloc \
--target=${OBJFMT} ${PROG.so} ${.TARGET}
.include <bsd.prog.mk>
diff --git a/sys/arch/amd64/stand/efiboot/bootia32/Makefile b/sys/arch/amd64/stand/efiboot/bootia32/Makefile
index 7945650e9f6..a1a7b438f75 100644
--- a/sys/arch/amd64/stand/efiboot/bootia32/Makefile
+++ b/sys/arch/amd64/stand/efiboot/bootia32/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2015/12/02 11:51:22 yasuoka Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/13 19:56:56 kettenis Exp $
.include <bsd.own.mk>
@@ -15,3 +15,4 @@ COPTS= -I${EFIDIR}/include/i386
CFLAGS+= -m32
AFLAGS+= -m32
+LDFLAGS+= -N