6 files changed, 6 insertions, 6 deletions
diff --git a/ld/emulparams/elf32lriscv.sh b/ld/emulparams/elf32lriscv.sh
index da0d7cf..4246013 100644
--- a/ld/emulparams/elf32lriscv.sh
+++ b/ld/emulparams/elf32lriscv.sh
@@ -6,7 +6,7 @@ OUTPUT_FORMAT="elf32-littleriscv"
 # On Linux, first look for 32 bit ILP32D target libraries in /lib/ilp32d as per
 # the glibc ABI.
 case "$target" in
-  riscv32*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *32*)
 	LIBPATH_SUFFIX="32/ilp32d 32" ;;
diff --git a/ld/emulparams/elf32lriscv_ilp32.sh b/ld/emulparams/elf32lriscv_ilp32.sh
index 4935937..c773985 100644
--- a/ld/emulparams/elf32lriscv_ilp32.sh
+++ b/ld/emulparams/elf32lriscv_ilp32.sh
@@ -5,7 +5,7 @@ OUTPUT_FORMAT="elf32-littleriscv"
 # On Linux, first look for 32 bit ILP32 target libraries in /lib/ilp32 as per
 # the glibc ABI.
 case "$target" in
-  riscv32*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *32*)
 	LIBPATH_SUFFIX="32/ilp32 32" ;;
diff --git a/ld/emulparams/elf32lriscv_ilp32f.sh b/ld/emulparams/elf32lriscv_ilp32f.sh
index c684bf8..a2f0c2a 100644
--- a/ld/emulparams/elf32lriscv_ilp32f.sh
+++ b/ld/emulparams/elf32lriscv_ilp32f.sh
@@ -5,7 +5,7 @@ OUTPUT_FORMAT="elf32-littleriscv"
 # On Linux, first look for 32 bit ILP32F target libraries in /lib/ilp32f as per
 # the glibc ABI.
 case "$target" in
-  riscv32*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *32*)
 	LIBPATH_SUFFIX="32/ilp32f 32" ;;
diff --git a/ld/emulparams/elf64lriscv.sh b/ld/emulparams/elf64lriscv.sh
index e07a064..7958052 100644
--- a/ld/emulparams/elf64lriscv.sh
+++ b/ld/emulparams/elf64lriscv.sh
@@ -6,7 +6,7 @@ OUTPUT_FORMAT="elf64-littleriscv"
 # On Linux, first look for 64 bit LP64D target libraries in /lib64/lp64d as per
 # the glibc ABI, and then /lib64 for backward compatility.
 case "$target" in
-  riscv64*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *64*)
 	LIBPATH_SUFFIX="64/lp64d 64";;
diff --git a/ld/emulparams/elf64lriscv_lp64.sh b/ld/emulparams/elf64lriscv_lp64.sh
index b1bb252..7c7feca 100644
--- a/ld/emulparams/elf64lriscv_lp64.sh
+++ b/ld/emulparams/elf64lriscv_lp64.sh
@@ -5,7 +5,7 @@ OUTPUT_FORMAT="elf64-littleriscv"
 # On Linux, first look for 64 bit LP64 target libraries in /lib64/lp64 as per
 # the glibc ABI, and then /lib64 for backward compatility.
 case "$target" in
-  riscv64*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *64*)
 	LIBPATH_SUFFIX="64/lp64 64";;
diff --git a/ld/emulparams/elf64lriscv_lp64f.sh b/ld/emulparams/elf64lriscv_lp64f.sh
index 005f191..e036c2f 100644
--- a/ld/emulparams/elf64lriscv_lp64f.sh
+++ b/ld/emulparams/elf64lriscv_lp64f.sh
@@ -5,7 +5,7 @@ OUTPUT_FORMAT="elf64-littleriscv"
 # On Linux, first look for 64 bit LP64F target libraries in /lib64/lp64f as per
 # the glibc ABI, and then /lib64 for backward compatility.
 case "$target" in
-  riscv64*-linux*)
+  riscv*-linux*)
     case "$EMULATION_NAME" in
       *64*)
 	LIBPATH_SUFFIX="64/lp64f 64";;