diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 355d97fc20..bc064dadf5 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* ld-srec/srec.exp (run_srec_test): Deal with ProPolice on
+	*-*-openbsd*.
+
 2005-04-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-discard/extern.d: Expect error.
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index b610baaf4c..55bca29d99 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -293,7 +293,14 @@ proc run_srec_test { test objs } {
     if [istarget xtensa*-*-*] {
 	set flags "$flags -no-relax"
     }
-    
+
+    # Some OpenBSD targets have ProPolice and reference __guard and
+    # __stack_smash_handler.
+    if [istarget *-*-openbsd*] {
+	set flags "$flags --defsym __guard=0"
+	set flags "$flags --defsym __stack_smash_handler=0"
+    }
+
     if { ![ld_simple_link $ld tmpdir/sr1 "$flags $objs"] \
 	 || ![ld_simple_link $ld tmpdir/sr2.sr "$flags --oformat srec $objs"] } {
 	fail $test