diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 009a8662835..93e29b71b9a 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -1da5ceb8daaab7a243fffd6a647554cf674716f8 +6f2bf15e15bf7516c393966577d72b79cba7f980 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/os_hurd.go b/libgo/go/runtime/os_hurd.go index fab17741c22..bb3e7ffc0fa 100644 --- a/libgo/go/runtime/os_hurd.go +++ b/libgo/go/runtime/os_hurd.go @@ -125,7 +125,3 @@ func osinit() { physPageSize = uintptr(getPageSize()) } } - -const ( - _CLOCK_REALTIME = 0 -)