RISC-V: Fix library search path for rv32.

2018-09-19  Kito Cheng  <kito@andestech.com>
ld/
	* emulparams/elf32lriscv.sh: Correct the library search path.
	* emulparams/elf32lriscv_ilp32.sh: Likewise.
	* emulparams/elf32lriscv_ilp32f.sh: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9d407418d0388e424735dabb4febedf17bb83990..1baf2b730580bb8c2f4e45d9e171967873c498e3 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-20  Kito Cheng  <kito@andestech.com>
+
+       * emulparams/elf32lriscv.sh: Correct the library search path.
+       * emulparams/elf32lriscv_ilp32.sh: Likewise.
+       * emulparams/elf32lriscv_ilp32f.sh: Likewise.
+
 2018-09-20  Nelson Chu <nelson.chu1990@gmail.com>
 
        * emultempl/nds32elf.em (hyper_relax): New variable.

diff --git a/ld/emulparams/elf32lriscv.sh b/ld/emulparams/elf32lriscv.sh
index e91f884cec446b79e65a250773eb7cd59a14dd4e..e405da353c09bd62a1b65d9ff6b87b45659b460c 100644 (file)
--- 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 ec676bcb1ddbbf19c3040c130a2f0604cbb230e3..6b6affe9a904692f534871a1f3c624ca6d078ea9 100644 (file)
--- 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 63304f9ef9a9eb9c26a293a53a0a26076cd8c36c..246f9ed4fb5315d174de80ca9067424a57ab1823 100644 (file)
--- 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