pr41558.f90: Use lp64 instead of hppa*64*-*-*.

	* gfortran.dg/guality/pr41558.f90: Use lp64 instead of hppa*64*-*-*.
	* gcc.dg/special/weak-1.c: Likewise.
	* gcc.dg/ucnid-12.c: Likewise.
	* gcc.dg/torture/pr45678-1.c: Likewise.
	* gcc.dg/torture/pr45678-2.c: Likewise.
	* gcc.dg/vector-4.c: Likewise.
	* gcc.dg/ipa/inline-5.c: Likewise.
	* gcc.dg/ucnid-11.c: Likewise.
	* gcc.misc-tests/gcov-13.c: Likewise.
	* gcc.misc-tests/gcov-14.c: Likewise.
	* g++.dg/ext/label13.C: Likewise.
	* gcc.dg/tree-ssa/ssa-fre-31.c: Use dg-additional-options for extra
	hppa*-*-hpux* options.
	* gcc.dg/tree-ssa/ssa-fre-33.c: Likewise.
	* gcc.dg/tree-ssa/ssa-fre-34.c: Likewise.
	* gcc.dg/pr48616.c: Likewise.
	* gcc.dg/pr17957.c: Likewise.
	* gcc.dg/pr17055-1.c: Likewise.
	* gcc.dg/pr32912-1.c: Likewise.
	* gcc.dg/tm/pr51472.c: Likewise.
	* c-c++-common/fold-bitand-4.c: Likewise.
	* c-c++-common/Wunused-var-12.c: Use lp64 instead of hppa*64*-*-*.
	Use dg-additional-options for extra options.

From-SVN: r183985

22 files changed, 48 insertions, 22 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e52990f..3fc813a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2012-02-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* gfortran.dg/guality/pr41558.f90: Use lp64 instead of hppa*64*-*-*.
+	* gcc.dg/special/weak-1.c: Likewise.
+	* gcc.dg/ucnid-12.c: Likewise.
+	* gcc.dg/torture/pr45678-1.c: Likewise.
+	* gcc.dg/torture/pr45678-2.c: Likewise.
+	* gcc.dg/vector-4.c: Likewise.
+	* gcc.dg/ipa/inline-5.c: Likewise.
+	* gcc.dg/ucnid-11.c: Likewise.
+	* gcc.misc-tests/gcov-13.c: Likewise.
+	* gcc.misc-tests/gcov-14.c: Likewise.
+	* g++.dg/ext/label13.C: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-31.c: Use dg-additional-options for extra
+	hppa*-*-hpux* options.
+	* gcc.dg/tree-ssa/ssa-fre-33.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-34.c: Likewise.
+	* gcc.dg/pr48616.c: Likewise.
+	* gcc.dg/pr17957.c: Likewise.
+	* gcc.dg/pr17055-1.c: Likewise.
+	* gcc.dg/pr32912-1.c: Likewise.
+	* gcc.dg/tm/pr51472.c: Likewise.
+	* c-c++-common/fold-bitand-4.c: Likewise.
+	* c-c++-common/Wunused-var-12.c: Use lp64 instead of hppa*64*-*-*.
+	Use dg-additional-options for extra options.
+
 2012-02-07  Joern Rennecke <joern.rennecke@embecosm.com>
 
 	* gcc.target/epiphany/interrupt-2.c: New test.
diff --git a/gcc/testsuite/c-c++-common/Wunused-var-12.c b/gcc/testsuite/c-c++-common/Wunused-var-12.c
index 94e56d8..b2fb9ac 100644
--- a/gcc/testsuite/c-c++-common/Wunused-var-12.c
+++ b/gcc/testsuite/c-c++-common/Wunused-var-12.c
@@ -1,7 +1,7 @@
 /* PR c++/44780 */
 /* { dg-do compile } */
 /* { dg-options "-Wunused" } */
-/* { dg-options "-Wunused -fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
+/* { dg-additional-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */
 
 typedef double vec __attribute__ ((__vector_size__ (16)));
 vec c, d;
diff --git a/gcc/testsuite/c-c++-common/fold-bitand-4.c b/gcc/testsuite/c-c++-common/fold-bitand-4.c
index f4bfe2f..a5d3168b 100644
--- a/gcc/testsuite/c-c++-common/fold-bitand-4.c
+++ b/gcc/testsuite/c-c++-common/fold-bitand-4.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-fdump-tree-original" } */
-/* { dg-options "-fdump-tree-original -fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 
 typedef char char4[4] __attribute__ ((aligned (4)));
 char4 c4[4] __attribute__ ((aligned (16)));
diff --git a/gcc/testsuite/g++.dg/ext/label13.C b/gcc/testsuite/g++.dg/ext/label13.C
index d932a9a..db349b5 100644
--- a/gcc/testsuite/g++.dg/ext/label13.C
+++ b/gcc/testsuite/g++.dg/ext/label13.C
@@ -8,7 +8,7 @@ struct C
   C();
 };
 
-C::C()	// { dg-bogus "can never be copied" "" { xfail { { *-apple-darwin* alpha*-dec-osf* } || { hppa*-*-hpux* && { ! hppa*64*-*-* } } } } }
+C::C()	// { dg-bogus "can never be copied" "" { xfail { { *-apple-darwin* alpha*-dec-osf* } || { hppa*-*-hpux* && { ! lp64 } } } } }
 {
   static void *labelref = &&label;
   goto *labelref;
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-5.c b/gcc/testsuite/gcc.dg/ipa/inline-5.c
index 031ee41..d4b7410 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-5.c
@@ -31,6 +31,6 @@ accessreference (struct a *a)
     /* Will be eliminated by inlining */
 }
 
-/* { dg-final { scan-ipa-dump-times "Will be eliminated" 4 "inline" { xfail { { hppa*-*-* } && { ! hppa*64*-*-* } } } } } */
+/* { dg-final { scan-ipa-dump-times "Will be eliminated" 4 "inline" { xfail { { hppa*-*-* } && { ! lp64 } } } } } */
 /* { dg-final { scan-ipa-dump-times "50. will be eliminated" 1 "inline"  } } */
 /* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/pr17055-1.c b/gcc/testsuite/gcc.dg/pr17055-1.c
index faac48b..d550076 100644
--- a/gcc/testsuite/gcc.dg/pr17055-1.c
+++ b/gcc/testsuite/gcc.dg/pr17055-1.c
@@ -1,7 +1,7 @@
 /* PR middle-end/17055.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-options "-O2 -ffast-math -fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-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 ea18ea80..8e90003 100644
--- a/gcc/testsuite/gcc.dg/pr17957.c
+++ b/gcc/testsuite/gcc.dg/pr17957.c
@@ -1,6 +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* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 __attribute__ ((vector_size (64))) unsigned char v1, v2, v3;
 void
 vadd (void)
diff --git a/gcc/testsuite/gcc.dg/pr32912-1.c b/gcc/testsuite/gcc.dg/pr32912-1.c
index 4fcc29a..0f9f64a 100644
--- a/gcc/testsuite/gcc.dg/pr32912-1.c
+++ b/gcc/testsuite/gcc.dg/pr32912-1.c
@@ -1,8 +1,8 @@
 /* PR middle-end/32912 */
 /* { dg-do run } */
 /* { dg-options "-O2 -w" } */
-/* { dg-options "-O2 -w -fno-common" { target hppa*-*-hpux* } } */
-/* { dg-options "-O2 -w -msse" { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-msse" { target { i?86-*-* x86_64-*-* } } } */
 /* { dg-require-effective-target sse_runtime { target { i?86-*-* x86_64-*-* } } } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/pr48616.c b/gcc/testsuite/gcc.dg/pr48616.c
index 6cad235..303f9a3 100644
--- a/gcc/testsuite/gcc.dg/pr48616.c
+++ b/gcc/testsuite/gcc.dg/pr48616.c
@@ -1,7 +1,7 @@
 /* PR tree-optimization/48616 */
 /* { dg-do run } */
 /* { dg-options "-O2 -ftree-vectorize" } */
-/* { dg-options "-O2 -ftree-vectorize -fno-common" { target alpha*-dec-osf* hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target alpha*-dec-osf* hppa*-*-hpux* } } */
 
 extern void abort (void);
 int a[4] __attribute__((aligned (32)));
diff --git a/gcc/testsuite/gcc.dg/special/weak-1.c b/gcc/testsuite/gcc.dg/special/weak-1.c
index fd45acd..175fb9c 100644
--- a/gcc/testsuite/gcc.dg/special/weak-1.c
+++ b/gcc/testsuite/gcc.dg/special/weak-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { xfail { hppa*-*-hpux* && { ! hppa*64*-*-* } } } } */
+/* { dg-do run { xfail { hppa*-*-hpux* && { ! lp64 } } } } */
 /* { dg-require-weak "" } */
 /* { dg-additional-sources weak-1a.c } */
 /* See PR target/23387 for hppa xfail details.  */
diff --git a/gcc/testsuite/gcc.dg/tm/pr51472.c b/gcc/testsuite/gcc.dg/tm/pr51472.c
index 159db0b..67f0557 100644
--- a/gcc/testsuite/gcc.dg/tm/pr51472.c
+++ b/gcc/testsuite/gcc.dg/tm/pr51472.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-fgnu-tm -O  --param tm-max-aggregate-size=32" } */
-/* { dg-options "-fgnu-tm -fno-common -O  --param tm-max-aggregate-size=32" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 
 typedef int __attribute__ ((vector_size (16))) vectype;
 vectype v;
diff --git a/gcc/testsuite/gcc.dg/torture/pr45678-1.c b/gcc/testsuite/gcc.dg/torture/pr45678-1.c
index 7a90b0b..9abc7fd 100644
--- a/gcc/testsuite/gcc.dg/torture/pr45678-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr45678-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
+/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */
 
 typedef float V __attribute__ ((vector_size (16)));
 V g;
diff --git a/gcc/testsuite/gcc.dg/torture/pr45678-2.c b/gcc/testsuite/gcc.dg/torture/pr45678-2.c
index df79de7..037fc2a 100644
--- a/gcc/testsuite/gcc.dg/torture/pr45678-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pr45678-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
+/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */
 
 typedef float V __attribute__ ((vector_size (16)));
 V g;
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
index 235bd7e..bddf78ef 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fdump-tree-fre1-details" } */
-/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 
 typedef double d128 __attribute__((vector_size(16)));
 typedef float f128 __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
index 7f19e65..4108188 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fdump-tree-fre1-details" } */
-/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 
 #define vector __attribute__((vector_size(16) ))
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
index e92be29..f3cefa5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fdump-tree-fre1-details" } */
-/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */
+/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */
 
 #define vector __attribute__((vector_size(16) ))
 
diff --git a/gcc/testsuite/gcc.dg/ucnid-11.c b/gcc/testsuite/gcc.dg/ucnid-11.c
index 3faa4927..6d40ef4 100644
--- a/gcc/testsuite/gcc.dg/ucnid-11.c
+++ b/gcc/testsuite/gcc.dg/ucnid-11.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-xfail-if "" { powerpc-ibm-aix* } { "*" } { "" } } */
 /* { dg-skip-if "" { ! ucn } { "*" } { "" } } */
-/* { dg-skip-if "-fdata-sections not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "-fdata-sections not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */
 /* { dg-options "-std=c99 -fextended-identifiers -fdata-sections" } */
 
 #include "ucnid-3.c"
diff --git a/gcc/testsuite/gcc.dg/ucnid-12.c b/gcc/testsuite/gcc.dg/ucnid-12.c
index 9ea2836..dd5e6d5 100644
--- a/gcc/testsuite/gcc.dg/ucnid-12.c
+++ b/gcc/testsuite/gcc.dg/ucnid-12.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-xfail-if "" { powerpc-ibm-aix* } { "*" } { "" } } */
 /* { dg-skip-if "" { ! ucn } { "*" } { "" } } */
-/* { dg-skip-if "-ffunction-sections not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "-ffunction-sections not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */
 /* { dg-options "-std=c99 -fextended-identifiers -ffunction-sections" } */
 
 #include "ucnid-4.c"
diff --git a/gcc/testsuite/gcc.dg/vector-4.c b/gcc/testsuite/gcc.dg/vector-4.c
index 9fa60de..cc4d504 100644
--- a/gcc/testsuite/gcc.dg/vector-4.c
+++ b/gcc/testsuite/gcc.dg/vector-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
+/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */
 #define vector __attribute__((vector_size(4*sizeof(int)) ))
 
 vector int a, b, c;
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-13.c b/gcc/testsuite/gcc.misc-tests/gcov-13.c
index e26f76b..e443f48 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-13.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-13.c
@@ -4,7 +4,7 @@
 /* { dg-require-weak "" } */
 /* { dg-do run { target native } } */
 /* { dg-additional-sources "gcovpart-13b.c" } */
-/* { dg-skip-if "weak ellision not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "weak ellision not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */
 
 int __attribute__ ((weak)) weak ()
 {
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-14.c b/gcc/testsuite/gcc.misc-tests/gcov-14.c
index a858509..564b08e 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-14.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-14.c
@@ -6,7 +6,7 @@
 /* { dg-require-weak "" } */
 /* { dg-do run { target native } } */
 /* { dg-skip-if "undefined weak not supported" { alpha*-dec-osf* } } */
-/* { dg-skip-if "undefined weak not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } */
+/* { dg-skip-if "undefined weak not supported" { { hppa*-*-hpux* } && { ! lp64 } } } */
 
 extern int __attribute__ ((weak)) Foo ();
 
diff --git a/gcc/testsuite/gfortran.dg/guality/pr41558.f90 b/gcc/testsuite/gfortran.dg/guality/pr41558.f90
index e26914c..8a84de4 100644
--- a/gcc/testsuite/gfortran.dg/guality/pr41558.f90
+++ b/gcc/testsuite/gfortran.dg/guality/pr41558.f90
@@ -1,6 +1,6 @@
 ! PR debug/41558
 ! { dg-do run }
-! { dg-skip-if "PR testsuite/51875" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } }
+! { dg-skip-if "PR testsuite/51875" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } }
 ! { dg-options "-g" }
 
 subroutine f (s)