diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2c4a771725..3758e28eae 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* ld-discard/discard.exp: xfail m6812.
+	* ld-scripts/map-address.d: Adjust for extras emitted by pe targets.
+
 2002-08-27  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-mmix/b-nosym.d: Revert last change.
diff --git a/ld/testsuite/ld-discard/discard.exp b/ld/testsuite/ld-discard/discard.exp
index ef054e7ed6..1a46ff1271 100644
--- a/ld/testsuite/ld-discard/discard.exp
+++ b/ld/testsuite/ld-discard/discard.exp
@@ -41,6 +41,7 @@ for { set i 0 } { $i < [llength $test_list] } { incr i } {
     # We need to strip the ".d", but can leave the dirname.
     verbose [file rootname [lindex $test_list $i]]
     # These fail because they use the generic linker.
-    setup_xfail "arc-*" "d30v-*" "dlx-*" "i960-*" "or32-*" "pj-*"
+    setup_xfail "arc-*" "d30v-*" "dlx-*" "i960-*" "m6812-*" "m68hc12-*"
+    setup_xfail "or32-*" "pj-*"
     run_dump_test [file rootname [lindex $test_list $i]]
 }
diff --git a/ld/testsuite/ld-scripts/map-address.d b/ld/testsuite/ld-scripts/map-address.d
index da377c42d8..289b685041 100644
--- a/ld/testsuite/ld-scripts/map-address.d
+++ b/ld/testsuite/ld-scripts/map-address.d
@@ -1,6 +1,6 @@
 #...
 Linker script and memory map
-
+#...
  *0x0*010001 *\. = 0x10001
  *0x0*010001 *foo = \.
  *0x0*010201 *\. = \(\. \+ 0x200\)