internal/syscall/unix: define copyFileRangeTrap for all architectures

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/246363

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 89d1f3c76238f40de9e947ac74a0a878f23ac5d5..39849522124a7d7f512322d5fddf0e99dc8c4e3b 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2c390ba951e83b547f6387cc9e19436c085b3775
+82a0db12bcb205748a5319b03e070d5502246ba7
 
 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/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 9587b5aa4caf004945f33f5fd01884f72b893c5b..c40bc8488138707db746ed9bdd29ea2c2ac34e7d 100644 (file)
--- 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/getrandom_linux_amd64p32.go b/libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go
similarity index 58%
rename from libgo/go/internal/syscall/unix/getrandom_linux_amd64p32.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go
index 911b6089ff3e6cbdcb9e1d343175605e571b4552..3e5fd4583ba43b970f1ac7516de075093c9a1ce8 100644 (file)
--- a/libgo/go/internal/syscall/unix/getrandom_linux_amd64p32.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_amd64p32.go
@@ -4,6 +4,7 @@
 
 package unix
 
-// Linux getrandom system call number.
-// See GetRandom in getrandom_linux.go.
-const randomTrap uintptr = 0x40000000 + 318
+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 f48da40188eee4df132476fae48db43d2924a7aa..3e00703679a41c464102d268f2b1af91bfa748d5 100644 (file)
--- 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_s390.go b/libgo/go/internal/syscall/unix/sysnum_linux_ia64.go
similarity index 61%
rename from libgo/go/internal/syscall/unix/getrandom_linux_s390.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_ia64.go
index e3bc4ee355c0910116521bf51c1eb5e3c84bfc56..bb7c363cdc21fbdbf7f7d15e444d552c60978344 100644 (file)
--- a/libgo/go/internal/syscall/unix/getrandom_linux_s390.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 = 349
+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 5559d30d33125b37dcabd7ca3652b5a504bd7e30..97fc51215b6d92e31a9bdc9257cc8bdf4a513858 100644 (file)
--- 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 4d8f6c53a9929d87435507fcd3f1ed0e41cebc8e..b75a618e9cf644c74b4a3d99354dd08a07a4148f 100644 (file)
--- 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_ia64.go b/libgo/go/internal/syscall/unix/sysnum_linux_s390.go
similarity index 61%
rename from libgo/go/internal/syscall/unix/getrandom_linux_ia64.go
rename to libgo/go/internal/syscall/unix/sysnum_linux_s390.go
index d20ba238fcfb79dc44d071023cc54619e8d7039c..bf2c01e4e16dbc2b3ed6ef2b879de041ef312b8b 100644 (file)
--- a/libgo/go/internal/syscall/unix/getrandom_linux_ia64.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 = 1339
+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 e0e3521a704269caff2411a140ec4d563add2953..b5e58e4ee3ca4077e98984ced944115cfcc0f1a2 100644 (file)
--- 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 4874ec1bd8602514398dbdc1da53bcb41f86d657..63db571433b6cb1ceddca2fbb065df608c3ff8eb 100644 (file)
--- 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
+)