summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2017-05-11 03:41:55 +0000
committerjhb <jhb@FreeBSD.org>2017-05-11 03:41:55 +0000
commitcd85d2ba464801be89680dd84abd9079acb5aca8 (patch)
tree3a75654e8d3c6ae92eba0b23b0bedbb96961ca41
parent05ee0a299c2447454ad71393e99dc5983598ae3a (diff)
downloadFreeBSD-src-cd85d2ba464801be89680dd84abd9079acb5aca8.zip
FreeBSD-src-cd85d2ba464801be89680dd84abd9079acb5aca8.tar.gz
MFC 316512,316537: Use correct linker emulations for armeb and riscv.
-rw-r--r--sys/conf/kern.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 650b35e..b60a3d5 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -238,7 +238,7 @@ CFLAGS+= -std=${CSTD}
LD_EMULATION_aarch64=aarch64elf
LD_EMULATION_amd64=elf_x86_64_fbsd
LD_EMULATION_arm=armelf_fbsd
-LD_EMULATION_armeb=armelf_fbsd
+LD_EMULATION_armeb=armelfb_fbsd
LD_EMULATION_armv6=armelf_fbsd
LD_EMULATION_i386=elf_i386_fbsd
LD_EMULATION_mips= elf32btsmip_fbsd
@@ -249,6 +249,6 @@ LD_EMULATION_mipsn32= elf32btsmipn32_fbsd
LD_EMULATION_mipsn32el= elf32btsmipn32_fbsd # I don't think this is a thing that works
LD_EMULATION_powerpc= elf32ppc_fbsd
LD_EMULATION_powerpc64= elf64ppc_fbsd
-LD_EMULATION_riscv= elf64riscv
+LD_EMULATION_riscv64= elf64lriscv
LD_EMULATION_sparc64= elf64_sparc_fbsd
LD_EMULATION=${LD_EMULATION_${MACHINE_ARCH}}
OpenPOWER on IntegriCloud