From e3f148dff6d6d926d1f39802f54abd59bd9e887c Mon Sep 17 00:00:00 2001
From: Mahesh Bodapati <mbodapat@xilinx.com>
Date: Wed, 11 Jan 2017 13:13:57 +0530
Subject: [PATCH 01/54] LOCAL]: Testsuite - builtins tests require fpic
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>

Conflicts:

	gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
---
 gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
index 594c9297958..8350d9401d2 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp
@@ -48,6 +48,14 @@ 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