gcc:

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

	* config/mips/iris6.h [!IRIX_USING_GNU_LD]
	(SUPPORTS_INIT_PRIORITY): Define.

	gcc/testsuite:
	Backport from mainline:
	2010-11-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline
	warning.
	* g++.dg/abi/packed1.C (struct INNER): Ignore warning on
	mips-sgi-irix*.
	* g++.dg/cpp/_Pragma1.C: Skip on mips-sgi-irix*.
	* gcc.target/mips/call-3.c: Add dg-require-visibility.

From-SVN: r167419

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd44fd3cfa93c0c721c32a111915348c360e23e0..eaef356f897b151ed18375054d08c110b5f0e320 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2010-11-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config/mips/iris6.h [!IRIX_USING_GNU_LD]
+       (SUPPORTS_INIT_PRIORITY): Define.
+
 2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        Backport from mainline:

diff --git a/gcc/config/mips/iris.h b/gcc/config/mips/iris.h
index f10e8a04b4d24d9736bf8ddcd84607d4a45c659c..5260c625b095e1fed8afc5cb07083b6c46157c8c 100644 (file)
--- a/gcc/config/mips/iris.h
+++ b/gcc/config/mips/iris.h
@@ -205,6 +205,11 @@ along with GCC; see the file COPYING3.  If not see
    library search directories.  */
 #define LINK_ELIMINATE_DUPLICATE_LDIRECTORIES 1
 
+/* The SGI linker doesn't understand constructor priorities.  */
+#ifndef IRIX_USING_GNU_LD
+#define SUPPORTS_INIT_PRIORITY 0
+#endif
+
 /* Add -g to mips.h default to avoid confusing gas with local symbols
    generated from stabs info.  */
 #undef NM_FLAGS

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2620ee8d3c5b627e25e2c636b26dbc57d0f6a05d..0d0928bc690b301973306c28eaf9b79b52ae4688 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2010-11-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline
+       warning.
+       * g++.dg/abi/packed1.C (struct INNER): Ignore warning on
+       mips-sgi-irix*.
+       * g++.dg/cpp/_Pragma1.C: Skip on mips-sgi-irix*.
+       * gcc.target/mips/call-3.c: Add dg-require-visibility.
+
 2010-11-29  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/g++.dg/abi/packed1.C b/gcc/testsuite/g++.dg/abi/packed1.C
index 071fa8b12d82ac570b02b43ae08d622b91158ceb..5bec67aff6591ca4380b1ac6a6d5a390064903cc 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/packed1.C
+++ b/gcc/testsuite/g++.dg/abi/packed1.C
@@ -4,7 +4,7 @@
 
 extern "C" void abort ();
 
-struct INNER { // { dg-warning "inefficient.*vptr" "" { target alpha*-*-* ia64-*-* hppa*-*-* sparc*-*-* sh*-*-* } }
+struct INNER { // { dg-warning "inefficient.*vptr" "" { target alpha*-*-* ia64-*-* hppa*-*-* mips-sgi-irix* sparc*-*-* sh*-*-* } }
   virtual int foo() const { return 1; }
 } __attribute__ ((packed));
 

diff --git a/gcc/testsuite/g++.dg/cpp/_Pragma1.C b/gcc/testsuite/g++.dg/cpp/_Pragma1.C
index 3b58c1e6e22797fa8e16247068773b34459be24f..2ca13efbdb1a18f71ea185ba0bcaf26edb52f56d 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-*-* sh*-[us]*-elf m32c-*-* *-*-vxworks alpha*-dec-osf* } } } }
+// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* mips-sgi-irix* sh*-[us]*-elf m32c-*-* *-*-vxworks alpha*-dec-osf* } } } }
 
 #define push bar
 #define foo _Pragma ("pack(push)")

diff --git a/gcc/testsuite/gcc.target/mips/call-3.c b/gcc/testsuite/gcc.target/mips/call-3.c
index b552b61dd2635600a946d616de5fb092d4b27270..25f01d2a90102a34b8f0253ef6be6153010a636c 100644 (file)
--- a/gcc/testsuite/gcc.target/mips/call-3.c
+++ b/gcc/testsuite/gcc.target/mips/call-3.c
@@ -1,5 +1,6 @@
 /* { dg-options "-O2 -mrelax-pic-calls -mno-shared" } */
 /* { dg-final { scan-assembler "\\.reloc\t1f,R_MIPS_JALR,g\n1:\tjalr\t" } } */
+/* { dg-require-visibility "" } */
 
 __attribute__ ((visibility ("hidden"))) void g ();
 

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index decf7ef92940620404bdf80472a147bdaa17dee5..2d02160b9335689a076a283f8e937c3f20b6f936 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1999, 2000, 2002, 2004, 2007, 2008
+#   Copyright (C) 1997, 1999, 2000, 2002, 2004, 2007, 2008, 2010
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -37,6 +37,9 @@ proc prune_gcc_output { text } {
     regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
     regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
 
+    # Ignore second line of IRIX 6 linker multiline message.
+    regsub -all "(^|\n)\[ \t\]*that might degrade performance on an older version \\(rev. 2.2\\) R4000 processor.\[^\n\]*" $text "" text
+
     # Ignore harmless VTA note.
     regsub -all "(^|\n)\[^\n\]*: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without\[^\n\]*" $text "" text