From 9bcee9c9a153270c9bf73b73a6af564e715032ff Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 5 Dec 2019 17:51:10 +0000 Subject: [PATCH] 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 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-context.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 27e74e5cf68..917d7bcc8e5 100644 --- 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 170bced1818..d55baa26f55 100644 --- 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 -- 2.30.2