diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e62c91d949ee..c7b0b13ddde2 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.
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
index 12c055d71ad7..913ce5c014c2 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -716,7 +716,7 @@ runtime_malg(bool allocatestack, bool signalstack, byte** ret_stack, uintptr* re
 	G *newg;
 	byte* unused_stack;
 	uintptr unused_stacksize;
-#if USING_SPLIT_STACK
+#ifdef USING_SPLIT_STACK
 	int dont_block_signals = 0;
 	size_t ss_stacksize;
 #endif
@@ -738,7 +738,7 @@ runtime_malg(bool allocatestack, bool signalstack, byte** ret_stack, uintptr* re
 #endif
 		}
 
-#if USING_SPLIT_STACK
+#ifdef USING_SPLIT_STACK
 		*ret_stack = __splitstack_makecontext(stacksize,
 						      (void*)(&newg->stackcontext[0]),
 						      &ss_stacksize);
@@ -777,7 +777,7 @@ void stackfree(G*)
 void
 stackfree(G* gp)
 {
-#if USING_SPLIT_STACK
+#ifdef USING_SPLIT_STACK
   __splitstack_releasecontext((void*)(&gp->stackcontext[0]));
 #else
   // If gcstacksize is 0, the stack is allocated by libc and will be