From 66fb54b40c49c86e8cefa94523a3f65a6779d6f2 Mon Sep 17 00:00:00 2001
From: Mahesh Bodapati <mbodapat@xilinx.com>
Date: Wed, 11 Jan 2017 15:46:28 +0530
Subject: [PATCH 03/53] [LOCAL]: For dejagnu static testing on qemu, suppress
 warnings about multiple definitions from the test function and libc in line
 with method used by powerpc. Dynamic linking and using a qemu binary which
 understands sysroot resolves all test failures with builtins

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
---
 gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
index ad62a7348bc..3a38fb1de91 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
@@ -48,14 +48,10 @@ if { [istarget *-*-eabi*]
    lappend additional_flags "-Wl,--allow-multiple-definition"
 }
 
-<<<<<<< HEAD
-=======
 if [istarget "microblaze*-*-linux*"] {
    lappend additional_flags "-Wl,-zmuldefs"
-   lappend additional_flags "-fPIC"
 }
 
->>>>>>> 6ef6e5b... [LOCAL]: Testsuite - builtins tests require fpic
 foreach src [lsort [find $srcdir/$subdir *.c]] {
     if {![string match *-lib.c $src] && [runtest_file_p $runtests $src]} {
 	c-torture-execute [list $src \
-- 
2.17.1

