From: Rainer Orth Date: Mon, 13 Dec 2010 18:26:35 +0000 (+0000) Subject: gcc: X-Git-Tag: releases/gcc-4.4.6~218 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dca4705029ddf6d528b676b783146538e3ba6df;p=thirdparty%2Fgcc.git gcc: Backport from mainline: 2010-11-12 Rainer Orth * config/mips/iris.h [!IRIX_USING_GNU_LD] (SUPPORTS_INIT_PRIORITY): Define. gcc/testsuite: Backport from mainline: 2010-11-12 Rainer Orth * lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline warning. * g++.dg/cpp/_Pragma1.C: Skip on mips-sgi-irix*. From-SVN: r167761 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c796c40836e..e5b1b5d04b7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-12-13 Rainer Orth + + Backport from mainline: + 2010-11-12 Rainer Orth + + * config/mips/iris.h [!IRIX_USING_GNU_LD] + (SUPPORTS_INIT_PRIORITY): Define. + 2010-12-13 Rainer Orth Backport from mainline: diff --git a/gcc/config/mips/iris.h b/gcc/config/mips/iris.h index fce82174e66b..cd2e75614d5d 100644 --- a/gcc/config/mips/iris.h +++ b/gcc/config/mips/iris.h @@ -163,6 +163,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 ce287ab8cbad..5b31b4d8e908 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2010-12-13 Rainer Orth + + Backport from mainline: + 2010-11-12 Rainer Orth + + * lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline + warning. + * g++.dg/cpp/_Pragma1.C: Skip on mips-sgi-irix*. + 2010-12-09 Daniel Kraft PR fortran/46794 diff --git a/gcc/testsuite/g++.dg/cpp/_Pragma1.C b/gcc/testsuite/g++.dg/cpp/_Pragma1.C index e44709b45706..2cc09af21b1d 100644 --- 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-*-* } } } } +// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* mips-sgi-irix* sh*-[us]*-elf m32c-*-* } } } } #define push bar #define foo _Pragma ("pack(push)") diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 5a835098e259..72b27f4ce70c 100644 --- 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 + # It would be nice to avoid passing anything to gcc that would cause it to # issue these messages (since ignoring them seems like a hack on our part), # but that's too difficult in the general case. For example, sometimes