backport: _Pragma1.C: Skip on alpha*-dec-osf*.

	Backport from mainline:
	2010-04-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* g++.dg/cpp/_Pragma1.C: Skip on alpha*-dec-osf*.
	* g++.dg/eh/spbp.C: Likewise.
	* g++.dg/other/pragma-ep-1.C: Properly define p, remove
	superfluous casts.
	* objc.dg/dwarf-1.m: Skip on  alpha*-dec-osf*.
	* objc.dg/dwarf-2.m: Likewise.

From-SVN: r167765

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5b31b4d8e90852daedbe6b2e156d5ca8ce2303a7..68a374a3f8ad544e4a92b20cde2298e18c86e04a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2010-04-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * g++.dg/cpp/_Pragma1.C: Skip on alpha*-dec-osf*.
+       * g++.dg/eh/spbp.C: Likewise.
+       * g++.dg/other/pragma-ep-1.C: Properly define p, remove
+       superfluous casts.
+       * objc.dg/dwarf-1.m: Skip on  alpha*-dec-osf*.
+       * objc.dg/dwarf-2.m: Likewise.
+
 2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        Backport from mainline:

diff --git a/gcc/testsuite/g++.dg/cpp/_Pragma1.C b/gcc/testsuite/g++.dg/cpp/_Pragma1.C
index 2cc09af21b1d40f5f7c9b398fdafcfcda00b7fdb..60627df1cc6afedfd5c9bffa99c0ecce4ea842b0 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp/_Pragma1.C
+++ b/gcc/testsuite/g++.dg/cpp/_Pragma1.C
@@ -2,7 +2,7 @@
 // This is supposed to succeed only if
 // the target defines HANDLE_PRAGMA_PACK_PUSH_POP 
 // and doesn't define HANDLE_PRAGMA_PACK_WITH_EXPANSION.
-// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* mips-sgi-irix* sh*-[us]*-elf m32c-*-* } } } }
+// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* mips-sgi-irix* sh*-[us]*-elf m32c-*-* alpha*-dec-osf* } } } }
 
 #define push bar
 #define foo _Pragma ("pack(push)")

diff --git a/gcc/testsuite/g++.dg/eh/spbp.C b/gcc/testsuite/g++.dg/eh/spbp.C
index 181e65d213fb7cce6bb434ca216c1506bca26d58..a781622ef4ebb94edd46dba2f8a7bb03384c1ba4 100644 (file)
--- a/gcc/testsuite/g++.dg/eh/spbp.C
+++ b/gcc/testsuite/g++.dg/eh/spbp.C
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-gdwarf-2" } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 
 /* This was a bug on x86-darwin, where the register numbering for SP
    and BP was swapped (it's easy to do because on that port it's

diff --git a/gcc/testsuite/g++.dg/other/pragma-ep-1.C b/gcc/testsuite/g++.dg/other/pragma-ep-1.C
index 151003cb1539fb9fa521f30c5219e6ed300be697..9362943a527d73ad39023d388eae6700844a4d6a 100644 (file)
--- a/gcc/testsuite/g++.dg/other/pragma-ep-1.C
+++ b/gcc/testsuite/g++.dg/other/pragma-ep-1.C
@@ -22,6 +22,6 @@ extern "C" int three(void);
 
 extern "C" int four(void);
 
-void *p[] = {
-  (void *) one, (void *) two, (void *) three, (void *) four
+int (*p[])(void) = {
+  one, two, three, four
 };

diff --git a/gcc/testsuite/objc.dg/dwarf-1.m b/gcc/testsuite/objc.dg/dwarf-1.m
index 3bfabbae475aa4de87e634b742da50d26ecb3cb3..c04b613502e8d92a45bfc489c9a0d8740f9c4086 100644 (file)
--- a/gcc/testsuite/objc.dg/dwarf-1.m
+++ b/gcc/testsuite/objc.dg/dwarf-1.m
@@ -1,6 +1,6 @@
 /* { dg-options "-gdwarf-2 -dA" } */
 /* { dg-final { scan-assembler "\"id.0\".*DW_AT_name" } } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 @interface foo
   id x;
 @end

diff --git a/gcc/testsuite/objc.dg/dwarf-2.m b/gcc/testsuite/objc.dg/dwarf-2.m
index f85a750ee25e1c107b41ea9c8f532b97c843dd4d..bcbe578619d5ad48df28681819f0d6911aa312aa 100644 (file)
--- a/gcc/testsuite/objc.dg/dwarf-2.m
+++ b/gcc/testsuite/objc.dg/dwarf-2.m
@@ -1,4 +1,4 @@
 /* { dg-options "-gdwarf-2 -dA" } */
 /* { dg-final { scan-assembler "0x10\[^0-9a-f\].*DW_AT_language" } } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 int x;