diff --git a/ld/ChangeLog b/ld/ChangeLog
index d8b9a224859..3cf9141efa1 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR ld/21233
+	* testsuite/ld-elf/shared.exp: Xfail all PR21233 tests but the
+	first test for cris*-*-*.
+
 2017-04-04  Maciej W. Rozycki  <macro@imgtec.com>
 
 	PR ld/21233
diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index be30ec0235e..291f9e129e1 100644
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -130,7 +130,8 @@ if { [check_gc_sections_available] } {
 	    "$LFLAGS -shared -T pr21233.ld" "" "$AFLAGS_PIC" \
 	    {pr21233-l.s} \
 	    {{readelf --dyn-syms pr21233-l.sd}} \
-	    "libpr21233.so"] \
+	    "libpr21233.so"]]
+    run_ld_link_tests [list \
 	[list \
 	    "PR ld/21233 dynamic symbols with section GC (--undefined)" \
 	    "$LFLAGS --gc-sections -e foo --undefined=bar -T pr21233.ld" \
@@ -152,7 +153,7 @@ if { [check_gc_sections_available] } {
 	    "tmpdir/libpr21233.so" "" \
 	    {pr21233.s} \
 	    {{readelf --dyn-syms pr21233.sd}} \
-	    "pr21233-3"]]
+	     "pr21233-3"]] "cris*-*-*"
 }
 
 # Check to see if the C compiler works