diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 994ee04e14..42ba29b152 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-14  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* ld-elf/indirect.exp: Disable if -shared is not supported.
+	* lib/ld-lib.exp (check_shared_lib_support): Add aarch64*-*-elf and
+	arm*-*-elf to the exclude list.
+
 2012-12-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/14956
diff --git a/ld/testsuite/ld-elf/indirect.exp b/ld/testsuite/ld-elf/indirect.exp
index 165f89ac5a..07df2ccd5e 100644
--- a/ld/testsuite/ld-elf/indirect.exp
+++ b/ld/testsuite/ld-elf/indirect.exp
@@ -26,6 +26,12 @@ if ![is_elf_format] {
     return
 }
 
+# Skip target where -shared is not supported
+
+if ![check_shared_lib_support] {
+    return
+}
+
 # Check if compiler works
 if { [which $CC] == 0 } {
     return
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 5f49e74f9d..a3ff2e32e2 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1555,7 +1555,9 @@ proc check_gc_sections_available { } {
 # Only used and accurate for ELF targets at the moment
 
 proc check_shared_lib_support { } {
-    if {![istarget arc-*-*]
+    if {![istarget aarch64*-*-elf]
+	 && ![istarget arc-*-*]
+	 && ![istarget arm*-*-elf]
 	 && ![istarget avr-*-*]
 	 && ![istarget cr16-*-*]
 	 && ![istarget cris*-*-*]