76eb0434a40f44f3f9c8a81cf22f56bbeccad12a diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 39849522124..0bc8e1b5a59 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -82a0db12bcb205748a5319b03e070d5502246ba7 +7f0d3834ac40cf3bcbeb9b13926ab5ccb2523537 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/internal/syscall/unix/sysnum_linux_ia64.go b/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go index bb7c363cdc2..6a5d0c90fbe 100644 --- a/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go +++ b/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go @@ -5,6 +5,6 @@ package unix const ( - getrandomTrap uintptr = 315 - copyFileRangeTrap uintptr = 323 + getrandomTrap uintptr = 1339 + copyFileRangeTrap uintptr = 1347 )