diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f7c45eeb0d38..54c682a8b78c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-07faafda5fbd66a710153814f30d93c91461e7cb
+a3aef6b6df932ea6c7094d074695bc0b033a3d17
 
 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/go-context.S b/libgo/runtime/go-context.S
index 8beeebfb85a1..170bced1818a 100644
--- a/libgo/runtime/go-context.S
+++ b/libgo/runtime/go-context.S
@@ -66,4 +66,8 @@ __go_makecontext:
 
 	ret
 
+	.section	.note.GNU-stack,"",@progbits
+	.section	.note.GNU-split-stack,"",@progbits
+	.section	.note.GNU-no-split-stack,"",@progbits
+
 #endif