diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 681c326b4b..d9c703890d 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-31  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR ld/12360
+	* ld-elfcomm/elfcomm.exp (test1w1): Use same check as MIPS on
+	hppa*64*-*-*.
+
 2010-12-31  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* ld-mips-elf/mips-elf-flags.exp: Handle FreeBSD targets.
diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp
index e45c6b199b..572931b948 100644
--- a/ld/testsuite/ld-elfcomm/elfcomm.exp
+++ b/ld/testsuite/ld-elfcomm/elfcomm.exp
@@ -209,8 +209,8 @@ if { [ld_simple_link $ld tmpdir/common1.o $options] } {
 }
 
 # This test fails on MIPS because the backend sets type_change_ok.
-# The size change warning is suppressed.
-if {[istarget mips*-*-*]} {
+# The size change warning is suppressed.  Same on hppa64.
+if {[istarget mips*-*-*] || [istarget hppa*64*-*-*]} {
     if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`_?foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } {
         fail $test1w1
     } else {