From 88d51f79961baba6c931ea9469469fbe2985e10d Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 23 Jun 2018 02:44:36 +0000
Subject: runtime: use #ifdef instead of #if for USING_SPLIT_STACK

    USING_SPLIT_STACK is configured as defined/undefined, not 0/1.
    Most of the places test USING_SPLIT_STACK with #ifdef, with a
    few exceptions. This CL fixes the exceptions.

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

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

(limited to 'gcc/go')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e62c91d..c7b0b13 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bdead75ea02fa852a559f35b41453df0c47c9a66
+7008302f1f0eaa9508b2857185505d4dc7baac1e
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1