diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_amd64p32.go b/libgo/go/internal/syscall/unix/getrandom_linux_amd64p32.go
deleted file mode 100644
index 911b608..0000000
--- a/libgo/go/internal/syscall/unix/getrandom_linux_amd64p32.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 0x40000000 + 318
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_s390.go b/libgo/go/internal/syscall/unix/getrandom_linux_s390.go
deleted file mode 100644
index e3bc4ee..0000000
--- a/libgo/go/internal/syscall/unix/getrandom_linux_s390.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 349
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_alpha.go b/libgo/go/internal/syscall/unix/sysnum_linux_alpha.go
similarity index 61%
rename from libgo/go/internal/syscall/unix/getrandom_linux_alpha.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_alpha.go
index 9587b5a..c40bc84 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_alpha.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_alpha.go
@@ -4,6 +4,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 511
+const (
+	getrandomTrap     uintptr = 511
+	copyFileRangeTrap uintptr = 519
+)
diff --git a/libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go b/libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go
new file mode 100644
index 0000000..3e5fd45
--- /dev/null
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go
@@ -0,0 +1,10 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+const (
+	getrandomTrap     uintptr = 0x40000000 + 318
+	copyFileRangeTrap uintptr = 0x40000000 + 326
+)
diff --git a/libgo/go/internal/syscall/unix/sysnum_linux_generic.go b/libgo/go/internal/syscall/unix/sysnum_linux_generic.go
index f48da40..3e00703 100644
--- a/libgo/go/internal/syscall/unix/sysnum_linux_generic.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_generic.go
@@ -3,13 +3,13 @@
 // license that can be found in the LICENSE file.
 
 // +build linux
-// +build arm64 riscv64
+// +build arm64 arm64be nios2 riscv riscv64
 
 package unix
 
 // This file is named "generic" because at a certain point Linux started
 // standardizing on system call numbers across architectures. So far this
-// means only arm64 and riscv64 use the standard numbers.
+// means only arm64, nios2 and riscv use the standard numbers.
 
 const (
 	getrandomTrap     uintptr = 278
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_ia64.go b/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go
similarity index 61%
rename from libgo/go/internal/syscall/unix/getrandom_linux_ia64.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_ia64.go
index d20ba23..bb7c363 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_ia64.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go
@@ -4,6 +4,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 1339
+const (
+	getrandomTrap     uintptr = 315
+	copyFileRangeTrap uintptr = 323
+)
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_m68k.go b/libgo/go/internal/syscall/unix/sysnum_linux_m68k.go
similarity index 61%
rename from libgo/go/internal/syscall/unix/getrandom_linux_m68k.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_m68k.go
index 5559d30..97fc512 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_m68k.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_m68k.go
@@ -4,6 +4,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 352
+const (
+	getrandomTrap     uintptr = 352
+	copyFileRangeTrap uintptr = 376
+)
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go b/libgo/go/internal/syscall/unix/sysnum_linux_mips64p32x.go
similarity index 65%
rename from libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_mips64p32x.go
index 4d8f6c5..b75a618 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_mips64p32x.go
@@ -6,6 +6,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 6317
+const (
+	getrandomTrap     uintptr = 6317
+	copyFileRangeTrap uintptr = 6324
+)
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_alpha.go b/libgo/go/internal/syscall/unix/sysnum_linux_s390.go
similarity index 61%
copy from libgo/go/internal/syscall/unix/getrandom_linux_alpha.go
copy to libgo/go/internal/syscall/unix/sysnum_linux_s390.go
index 9587b5a..bf2c01e 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_alpha.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_s390.go
@@ -4,6 +4,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 511
+const (
+	getrandomTrap     uintptr = 349
+	copyFileRangeTrap uintptr = 375
+)
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_shx.go b/libgo/go/internal/syscall/unix/sysnum_linux_shx.go
similarity index 63%
rename from libgo/go/internal/syscall/unix/getrandom_linux_shx.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_shx.go
index e0e3521..b5e58e4 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_shx.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_shx.go
@@ -6,6 +6,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 373
+const (
+	getrandomTrap     uintptr = 373
+	copyFileRangeTrap uintptr = 380
+)
diff --git a/libgo/go/internal/syscall/unix/getrandom_linux_sparcx.go b/libgo/go/internal/syscall/unix/sysnum_linux_sparcx.go
similarity index 64%
rename from libgo/go/internal/syscall/unix/getrandom_linux_sparcx.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_sparcx.go
index 4874ec1..63db571 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_sparcx.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_sparcx.go
@@ -6,6 +6,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 347
+const (
+	getrandomTrap     uintptr = 347
+	copyFileRangeTrap uintptr = 357
+)