summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-12-05 17:51:10 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-12-05 17:51:10 +0000
commit9bcee9c9a153270c9bf73b73a6af564e715032ff (patch)
treece835114c98cb0502f940c7db9afc1df44b5fb22 /gcc/go
parentc3cb71ef35522f46afa6f11ee376cdcb73b893e8 (diff)
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
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 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.