diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f504598b9fe12e0ec5c9fdf37214f254011813b3..8b83f54c54854219a1d9135d0ff1b7b23a9e7979 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* gcc.dg/pr17055-1.c (dg-options): Add -fno-common to options on
+	hppa*-*-hpux*.
+	* gcc.dg/pr17957.c (dg-options): Likewise.
+	* gcc.dg/struct-ret-1.c: Add prototype for abort.
+	* gcc.dg/tree-ssa/asm-2.c, gcc.dg/tree-ssa/asm-3.c: Use register 1
+	instead of 0 on __hppa__.
+	* gcc.dg/tree-ssa/loop-1.c (dg-final): Check for five instances of
+	"foo,%r" on hppa*-*-*.
+
 2004-12-23  Bud Davis  <bdavis9659@comcast.net>
 
 	PR fortran/19071
diff --git a/gcc/testsuite/gcc.dg/pr17055-1.c b/gcc/testsuite/gcc.dg/pr17055-1.c
index 4c30973c1651db7d69a6bebf0c15fb7a3c4dda79..faac48bc3310f1f8aaf0650e458f7a1c17ca9eb4 100644
--- a/gcc/testsuite/gcc.dg/pr17055-1.c
+++ b/gcc/testsuite/gcc.dg/pr17055-1.c
@@ -1,6 +1,7 @@
 /* PR middle-end/17055.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math" } */
+/* { dg-options "-O2 -ffast-math -fno-common" { target hppa*-*-hpux* } } */
 
 /* This test used to abort, beacuse we do an "integer" fold to zero, i.e.
    x - x = (T)0 where T is the type of x.  Unfortunately, fold_convert
diff --git a/gcc/testsuite/gcc.dg/pr17957.c b/gcc/testsuite/gcc.dg/pr17957.c
index b3123382980f4d25ec0e5aa273e13bbf4f584a14..ea18ea80610a3f25cea6f8aaa2f1a2d6bec9b0d6 100644
--- a/gcc/testsuite/gcc.dg/pr17957.c
+++ b/gcc/testsuite/gcc.dg/pr17957.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "--param ggc-min-expand=0 --param ggc-min-heapsize=0" } */
+/* { dg-options "-fno-common --param ggc-min-expand=0 --param ggc-min-heapsize=0" { target hppa*-*-hpux* } } */
 __attribute__ ((vector_size (64))) unsigned char v1, v2, v3;
 void
 vadd (void)
diff --git a/gcc/testsuite/gcc.dg/struct-ret-1.c b/gcc/testsuite/gcc.dg/struct-ret-1.c
index 900ffbef7e327b694646fd179c206ae8c8d7926b..23c9e98130bb115751b7203f7dcb43ebd26981dc 100644
--- a/gcc/testsuite/gcc.dg/struct-ret-1.c
+++ b/gcc/testsuite/gcc.dg/struct-ret-1.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target hppa*-*-* } } */
 /* { dg-options { -O2 } { target hppa*-*-* } } */
+extern void abort (void);
 extern void exit (int);
 typedef struct {
         int             x;
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c b/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
index c07b0f1db8b373c303db4a317c3e02f569f6affc..afe83be47510bfa101e6e2e8ebf4fe938dd1e27d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
@@ -1,7 +1,11 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 
+#ifdef __hppa__
+#define REGISTER "1"
+#else
 #define REGISTER "0"
+#endif
 
 void baz(void)
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c b/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
index ddb0ddcbc6a1d9dee879c5e83772968afd36d169..9fbfc701511a712793b21dbc35cb1b3f0afa431c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
@@ -2,8 +2,12 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 
+#ifdef __hppa__
+#define REGISTER "1"
+#else
 #define REGISTER "0"
-                                                                                
+#endif
+
 static inline int source(void)
 {
   register int hardreg __asm__(REGISTER);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
index 72abd35854c4575e69f178e0c64c5d4395054a5d..fa9670fa7f72ee946416deb0c1a03b772b5f640b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
@@ -24,6 +24,6 @@ void xxx(void)
 /* { dg-final { scan-tree-dump-times "Added canonical iv to loop 1, 4 iterations" 1 "ivcanon"} } */
 /* { dg-final { scan-tree-dump-times "Unrolled loop 1 completely" 1 "cunroll"} } */
 /* { dg-final { scan-tree-dump-times "foo" 5 "vars"} } */
-/* { dg-final { scan-assembler-times "foo" 5} } */
+/* { dg-final { if [ istarget hppa*-*-* ] { scan-assembler-times "foo,%r" 5} else { scan-assembler-times "foo" 5} } }  */