diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 2f678352d9f..8b1ca485571 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -be6dbbdbe29f39d6d2ec0d5574ced398cb6e250a +16a48dbc1c69075321b388d235651b59abcb58ce 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 c44755f971c..f4bbfb60ec8 100644 --- a/libgo/runtime/go-unwind.c +++ b/libgo/runtime/go-unwind.c @@ -318,6 +318,8 @@ value_size (uint8_t encoding) case DW_EH_PE_sdata8: case DW_EH_PE_udata8: return 8; + case DW_EH_PE_absptr: + return sizeof(uintptr); default: break; }