diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 27e74e5..917d7bc 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 170bced..d55baa2 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 |