diff --git a/ld/ChangeLog b/ld/ChangeLog
index e24810434b..4ba266c93c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,8 @@
 2000-02-25  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+	* configure.tgt (targ_extra_ofiles): Enable elf64_sparc on
+	GNU/Linux/sparc, but keep the default as 32.
+
 	* configure.tgt: Enable elf64_sparc on Solaris7+/sparc.  And make
 	it default if sparcv9 or sparc64.
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 36482fca2f..88f3696c44 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -47,8 +47,9 @@ sparc64-*-linux-gnu*)	targ_emul=elf64_sparc
 			tdir_sun4=sparc-sun-sunos4
 			;;
 sparc*-*-linux-gnu*)	targ_emul=elf32_sparc
-			targ_extra_emuls="sparclinux sun4"
+			targ_extra_emuls="sparclinux elf64_sparc sun4"
 			tdir_sparclinux=${targ_alias}aout
+			tdir_elf64_sparc=`echo ${targ_alias} | sed -e 's/32//'`
 			tdir_sun4=sparc-sun-sunos4
 			;;
 sparc*-*-lynxos*)	targ_emul=sparclynx ;;