re PR go/92820 (libgo.so.15 has executable stack)

	PR go/92820
    runtime: always mark assembly file as non-executable stack

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/210037

From-SVN: r279010

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 27e74e5cf682b4f704dc86a04d1ea09270335a23..917d7bcc8e5f3d2306b456f325ccae84e0f40778 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-017830d2a4bd2efbddf5e841ba9ccff8acf9d7c8
+a59794347b9db6dc2101a65c3e1a068051c0ee81
 
 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 170bced1818a000c31e97084653529d18a100470..d55baa26f559f47cf8a1b71b03cb77d580c86914 100644 (file)
--- a/libgo/runtime/go-context.S
+++ b/libgo/runtime/go-context.S
@@ -66,8 +66,9 @@ __go_makecontext:
 
        ret
 
-       .section        .note.GNU-stack,"",@progbits
        .section        .note.GNU-split-stack,"",@progbits
        .section        .note.GNU-no-split-stack,"",@progbits
 
 #endif
+
+       .section        .note.GNU-stack,"",@progbits