Backport from mainline

	2013-01-16  Janis Johnson  <janisjo@codesourcery.com>

	PR testsuite/55994
	* gcc.c-torture/execute/builtins/builtins.exp: Add
	-Wl,--allow-multiple-definition for eabi and elf targets.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@195458 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2ece94b..2c3097a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,13 @@
 2013-01-24  Janis Johnson  <janisjo@codesourcery.com>
 
        Backport from mainline
+       2013-01-16  Janis Johnson  <janisjo@codesourcery.com>
+
+       PR testsuite/55994
+       * gcc.c-torture/execute/builtins/builtins.exp: Add
+       -Wl,--allow-multiple-definition for eabi and elf targets.
+
+       Backport from mainline
        2013-01-17  Janis Johnson  <janisjo@codesourcery.com>
 
        * gcc.target/arm/pr51835.c: Avoid conflicts with multilib flags.

diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
index a54f3c1..f86d535 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
@@ -41,6 +41,10 @@ set additional_flags ""
 if [istarget "powerpc-*-darwin*"] {
    lappend additional_flags "-Wl,-multiply_defined,suppress"
 }
+if { [istarget *-*-eabi*]
+     || [istarget *-*-elf] } {
+   lappend additional_flags "-Wl,--allow-multiple-definition"
+}
 
 foreach src [lsort [find $srcdir/$subdir *.c]] {
     if {![string match *-lib.c $src] && [runtest_file_p $runtests $src]} {