Skip to content

Commit 34d8dc9

Browse files
authored
Merge pull request #621 from rota1001/rv64
Disable linker relaxation for riscv64
2 parents 295c17a + 5ee9e30 commit 34d8dc9

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

tools/lkl/Makefile.autoconf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ define aarch64_host
3838
$(call set_autoconf_var,AARCH64,y)
3939
endef
4040

41+
define riscv64_host
42+
$(call set_autoconf_var,RISCV64,y)
43+
LDFLAGS += -Wl,--no-relax
44+
endef
45+
4146
define virtio_net_dpdk
4247
$(call set_autoconf_var,VIRTIO_NET_DPDK,y)
4348
RTE_SDK ?= $(OUTPUT)/dpdk-17.02
@@ -75,6 +80,7 @@ define posix_host
7580
$(if $(filter $(1),elf64-x86-64-freebsd),$(call bsd_host))
7681
$(if $(filter $(1),elf32-littlearm),$(call arm_host))
7782
$(if $(filter $(1),elf64-littleaarch64),$(call aarch64_host))
83+
$(if $(filter $(1),elf64-littleriscv),$(call riscv64_host))
7884
$(if $(filter yes,$(dpdk)),$(call virtio_net_dpdk))
7985
$(if $(filter yes,$(vde)),$(call virtio_net_vde))
8086
$(if $(strip $(call find_include,fuse3/fuse.h)),$(call set_autoconf_var,FUSE,y))

tools/lkl/Targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs
99
LDLIBS_lib/hijack/liblkl-hijack-y += -ldl
1010
LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_ARM) += -lgcc -lc
1111
LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_AARCH64) += -lgcc -lc
12+
LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_RISCV64) += -lgcc -lc
1213
LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_I386) += -lc_nonshared
1314

1415
LDFLAGS_lib/hijack/liblkl-zpoline-$(LKL_HOST_CONFIG_POSIX) += -shared -nodefaultlibs

0 commit comments

Comments
 (0)