svn commit: r318170 - stable/11/sys/conf

[John Baldwin]

Author: jhb
Date: Thu May 11 03:41:55 2017
New Revision: 318170
URL: https://svnweb.freebsd.org/changeset/base/318170

Log:
  MFC 316512,316537: Use correct linker emulations for armeb and riscv.

Modified:
  stable/11/sys/conf/kern.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/kern.mk
==============================================================================
--- stable/11/sys/conf/kern.mk	Thu May 11 03:37:05 2017	(r318169)
+++ stable/11/sys/conf/kern.mk	Thu May 11 03:41:55 2017	(r318170)
@@ -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_fbs
 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}}