diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cb94d3c614..dbca5ed401 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/elf.exp: Add Solaris/x86-64 support to eh[1-4] test.
+
 2012-08-24  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
 	* ld-arm/arm-elf.exp: Add new testcases.
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 9964ccd16e..1780b50e16 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -44,6 +44,11 @@ if { [istarget "*-*-nacl*"] } {
     set options_regsub(ld) {-melf_x86_64 -melf_x86_64_nacl}
 }
 
+if { [istarget "*-*-solaris*"] } {
+    # Same for Solaris
+    set options_regsub(ld) {-melf_x86_64 -melf_x86_64_sol2}
+}
+
 if { [is_remote host] } then {
     remote_download host merge.ld
 }