diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/runtime_test.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 6e783c9..76689a3 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a9da4d34a2f878a5058f7e7d2beef52aa62471a1 +e32e9aaee598eeb43f9616cf6ca1d11acaa9d167 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/runtime_test.go b/libgo/go/runtime/runtime_test.go index 995ce25..222679e0 100644 --- a/libgo/go/runtime/runtime_test.go +++ b/libgo/go/runtime/runtime_test.go @@ -166,6 +166,9 @@ func TestSetPanicOnFault(t *testing.T) { } func testSetPanicOnFault(t *testing.T, addr uintptr, nfault *int) { + if strings.Contains(Version(), "llvm") { + t.Skip("LLVM doesn't support non-call exception") + } if GOOS == "nacl" { t.Skip("nacl doesn't seem to fault on high addresses") } |