diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b0ab8c499b5..4e1153f4765 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-14  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* ld-sparc/sparc.exp: Enable on Solaris.  Disable 32-bit tests
+	on sparc64-elf.
+
 2005-02-13  Jan Beulich  <jbeulich@novell.com>
 
 	* ld-elfvers/vers.exp (as_options): New. Set to -x for ia64.
diff --git a/ld/testsuite/ld-sparc/sparc.exp b/ld/testsuite/ld-sparc/sparc.exp
index 93767832520..f34fa9e74e8 100644
--- a/ld/testsuite/ld-sparc/sparc.exp
+++ b/ld/testsuite/ld-sparc/sparc.exp
@@ -16,10 +16,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-# Test i386 linking; all types of relocs.  This tests the assembler and
+# Test SPARC linking; all types of relocs.  This tests the assembler and
 # tools like objdump as well as the linker.
 
-if { !([istarget "sparc*-*-elf*"]		
+if { !([istarget "sparc*-*-elf*"]
+       || [istarget "sparc*-sun-solaris*"]
        || ([istarget "sparc*-*-linux*"]
 	   && ![istarget "*-*-*aout*"]
 	   && ![istarget "*-*-*oldld*"])) } {
@@ -84,5 +85,7 @@ set sparc64tests {
      {{objdump -sj.debug_foobar tlsg64.sd}} "tlsg64"}
 }
 
-run_ld_link_tests $sparctests
+if { ![istarget "sparc64-*-elf*"] } {
+    run_ld_link_tests $sparctests
+}
 # run_ld_link_tests $sparc64tests