diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-unwind.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 2bcf536..056653a 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -785414705628bf9d1279a8042e1886440424aade +5a9ff61d72c95a50cbbfb0e1bf57646197910363 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-unwind.c b/libgo/runtime/go-unwind.c index 388d7c7..58cb270 100644 --- a/libgo/runtime/go-unwind.c +++ b/libgo/runtime/go-unwind.c @@ -444,6 +444,9 @@ PERSONALITY_FUNCTION (int version, switch (state & _US_ACTION_MASK) { case _US_VIRTUAL_UNWIND_FRAME: + if (state & _UA_FORCE_UNWIND) + /* We are called from _Unwind_Backtrace. No handler to run. */ + CONTINUE_UNWINDING; actions = _UA_SEARCH_PHASE; break; |