From dbfcd05365abb8c919517df8b6d718bb85b0aefe Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Thu, 20 Sep 2018 12:06:28 -0700 Subject: [PATCH] RISC-V: Fix library search path for rv32. 2018-09-19 Kito Cheng ld/ * emulparams/elf32lriscv.sh: Correct the library search path. * emulparams/elf32lriscv_ilp32.sh: Likewise. * emulparams/elf32lriscv_ilp32f.sh: Likewise. --- ld/ChangeLog | 6 ++++++ ld/emulparams/elf32lriscv.sh | 2 +- ld/emulparams/elf32lriscv_ilp32.sh | 2 +- ld/emulparams/elf32lriscv_ilp32f.sh | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 9d40741..1baf2b7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2018-09-20 Kito Cheng + + * emulparams/elf32lriscv.sh: Correct the library search path. + * emulparams/elf32lriscv_ilp32.sh: Likewise. + * emulparams/elf32lriscv_ilp32f.sh: Likewise. + 2018-09-20 Nelson Chu * emultempl/nds32elf.em (hyper_relax): New variable. diff --git a/ld/emulparams/elf32lriscv.sh b/ld/emulparams/elf32lriscv.sh index e91f884..e405da3 100644 --- a/ld/emulparams/elf32lriscv.sh +++ b/ld/emulparams/elf32lriscv.sh @@ -9,7 +9,7 @@ case "$target" in riscv32*-linux*) case "$EMULATION_NAME" in *32*) - LIBPATH_SUFFIX="/ilp32d" ;; + LIBPATH_SUFFIX="32/ilp32d 32" ;; esac ;; esac diff --git a/ld/emulparams/elf32lriscv_ilp32.sh b/ld/emulparams/elf32lriscv_ilp32.sh index ec676bc..6b6affe 100644 --- a/ld/emulparams/elf32lriscv_ilp32.sh +++ b/ld/emulparams/elf32lriscv_ilp32.sh @@ -8,7 +8,7 @@ case "$target" in riscv32*-linux*) case "$EMULATION_NAME" in *32*) - LIBPATH_SUFFIX="/ilp32" ;; + LIBPATH_SUFFIX="32/ilp32 32" ;; esac ;; esac diff --git a/ld/emulparams/elf32lriscv_ilp32f.sh b/ld/emulparams/elf32lriscv_ilp32f.sh index 63304f9..246f9ed 100644 --- a/ld/emulparams/elf32lriscv_ilp32f.sh +++ b/ld/emulparams/elf32lriscv_ilp32f.sh @@ -8,7 +8,7 @@ case "$target" in riscv32*-linux*) case "$EMULATION_NAME" in *32*) - LIBPATH_SUFFIX="/ilp32f" ;; + LIBPATH_SUFFIX="32/ilp32f 32" ;; esac ;; esac -- 2.7.4