diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 38887d2151..92e64ab60f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-07  Hans-Peter Nilsson  <hp@axis.com>
 
+	* ld-cris/stabs1.s: New file.
+	* ld-cris/undef2.d, ld-cris/undef3.d: New tests.
+
 	* ld-elf/start.s, ld-elf/symbolref.s, ld-elf/symbol1w.s,
 	ld-elf/warn1.d: New test.
 
diff --git a/ld/testsuite/ld-cris/stabs1.s b/ld/testsuite/ld-cris/stabs1.s
new file mode 100644
index 0000000000..837d69d679
--- /dev/null
+++ b/ld/testsuite/ld-cris/stabs1.s
@@ -0,0 +1,26 @@
+	.stabs	"/x/y/z/",100,0,2,Ltext0
+	.stabs	"/blah/foo.c",100,0,2,Ltext0
+	.text
+Ltext0:
+	.global _xyzzy
+	.type	_xyzzy, @function
+_xyzzy:
+	.stabd	46,0,0
+	.stabn	68,0,95,LM16-_xyzzy
+LM16:
+	.long 0
+	.stabn	68,0,96,LM17-_xyzzy
+LM17:
+	.long globsym1
+	.stabn	68,0,88,LM25-_xyzzy
+LM25:
+	.long 0
+	.size	_xyzzy, .-_xyzzy
+	.stabn	192,0,0,_xyzzy-_xyzzy
+	.stabn	224,0,0,Lscope0-_xyzzy
+Lscope0:
+;# This is the stabs construct that was barfed upon; BFD for
+;# a.out expects it to be of two parts, like the construct at
+;# the top of this file.
+	.stabs	"",100,0,0,Letext0
+Letext0:
diff --git a/ld/testsuite/ld-cris/undef2.d b/ld/testsuite/ld-cris/undef2.d
new file mode 100644
index 0000000000..46015c00ad
--- /dev/null
+++ b/ld/testsuite/ld-cris/undef2.d
@@ -0,0 +1,6 @@
+# source: start1.s
+# source: stabs1.s
+# target: cris-*-*elf* cris-*-*aout*
+# as: --em=crisaout
+# ld: -mcrisaout
+# error: .o:/blah/foo.c:96: undefined reference to `globsym1'$
diff --git a/ld/testsuite/ld-cris/undef3.d b/ld/testsuite/ld-cris/undef3.d
new file mode 100644
index 0000000000..e7bca10caf
--- /dev/null
+++ b/ld/testsuite/ld-cris/undef3.d
@@ -0,0 +1,6 @@
+#source: start1.s
+#source: stabs1.s
+#target: cris-*-*elf* cris-*-*aout*
+#as: --em=criself
+#ld: -mcriself
+#error: .o:/blah/foo.c:96: undefined reference to `globsym1'$