From c33c18cdc6b29a312464cb16996530b47a333c98 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 15 Sep 2015 17:05:14 +0000
Subject: libgo: test linking split-stack and non-split-stack together

    PPC has split-stack support in current GCC, but old version of gold will
    reject attempts to link PPC split-stack and non-split-stack code
    together.  Test for that, and don't compile the C code with
    -fsplit-stack if it doesn't work.

    Reviewed-on: https://go-review.googlesource.com/14594

From-SVN: r227802
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index afb257e..b1a7895 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-23392287e9a26956977987fe95f337c5be4d6417
+6f0ac34e139755c319368757fe2a093f1e5bde49
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1