diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3510293551..8c697cf6a9 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* emulparams/elf64_s390.sh (LIBPATH_SUFFIX): Set to 64.
+	* emulparams/elf_x86_64.sh (LIBPATH_SUFFIX): Likewise.
+	* emulparams/elf64_sparc.sh (LIBPATH_SUFFIX): Set instead of suffix.
+
 2003-02-05  Alan Modra  <amodra@bigpond.net.au>
 
 	* emultempl/ppc64elf.em (ppc_before_allocation): Size sections then
diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index 8cea83d61e..e441b8ac4d 100644
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -26,7 +26,7 @@ case "$target" in
   s390*-linux*)
     case "$EMULATION_NAME" in
       *64*)
-	LIBPATH_SUFFIX=$suffix ;;
+	LIBPATH_SUFFIX=64 ;;
     esac
     ;;
 esac
diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh
index 3bc3ea8719..ab3eec0ec6 100644
--- a/ld/emulparams/elf64_sparc.sh
+++ b/ld/emulparams/elf64_sparc.sh
@@ -42,9 +42,9 @@ case "$EMULATION_NAME" in
   *64*)
     case "$target" in
       sparc*-linux*)
-	suffix=64 ;;
+	LIBPATH_SUFFIX=64 ;;
       sparc*-solaris*)
-	suffix=/sparcv9 ;;
+	LIBPATH_SUFFIX=/sparcv9 ;;
     esac
     ;;
 esac
diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index 146b55fb32..61e8f29f94 100644
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -24,7 +24,7 @@ fi
 case "$target" in
   x86_64*-linux*)
     case "$EMULATION_NAME" in
-      *64*) LIBPATH_SUFFIX=$suffix ;;
+      *64*) LIBPATH_SUFFIX=64 ;;
     esac
     ;;
 esac