aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-01-29 15:31:10 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-01-29 15:31:10 +0000
commit6065f1c5889159c9fa1b6c74726d04fc9abea9fe (patch)
treefc8bafc955762ebe803bb67f0b2813659c95f935 /gcc
parentfac31afe6a8ee178de0662353dbd6f2cc5ab3556 (diff)
downloadgcc-6065f1c5889159c9fa1b6c74726d04fc9abea9fe.zip
gcc-6065f1c5889159c9fa1b6c74726d04fc9abea9fe.tar.gz
gcc-6065f1c5889159c9fa1b6c74726d04fc9abea9fe.tar.bz2
runtime: fix sigprof frame counting
If sigtramp and sigtrampgo are both on stack, n -= framesToDiscard is executed twice, which should actually run only once. Reviewed-on: https://go-review.googlesource.com/c/159238 From-SVN: r268366
Diffstat (limited to 'gcc')
-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 0eff5eb..10e20ce 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c2cac0ba0a92e74d5675c3c9f4e53d2567dbc903
+5af8ee0693944c280b1f529450dbfd4ec1ee451d
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.