Merge pull request #7490 from thaJeztah/bump_x_sys

vendor: golang.org/x/sys f5cb0306ac0e (fix for go1.27)
This commit is contained in:
Sebastiaan van Stijn
2026-11-05 23:46:40 +01:00
committed by GitHub
11 changed files with 451 additions and 430 deletions
+1 -1
View File
@@ -62,7 +62,7 @@ require (
go.opentelemetry.io/otel/trace v1.47.0
go.yaml.in/yaml/v3 v3.0.6
golang.org/x/sync v0.24.0
golang.org/x/sys v0.49.0
golang.org/x/sys v0.49.1-0.20261022125458-f5cb0306ac0e // includes fix for https://go.dev/issue/82324
golang.org/x/term v0.47.0
golang.org/x/text v0.43.0
gotest.tools/v3 v3.5.2
+2 -2
View File
@@ -206,8 +206,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/sys v0.49.1-0.20261022125458-f5cb0306ac0e h1:y3PdhEKVIFYc4c6gNZPEC7qPIoa9uH/2zIQEc0mw4R4=
golang.org/x/sys v0.49.1-0.20261022125458-f5cb0306ac0e/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM=
golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+8 -8
View File
@@ -14,13 +14,13 @@
// The runtime may know about them.
TEXT ·Syscall(SB),NOSPLIT,$0-56
MOVD $syscall·Syscall(SB), R31
MOVD R31, CTR
MOVD $syscall·Syscall(SB), R12
MOVD R12, CTR
JMP (CTR)
TEXT ·Syscall6(SB),NOSPLIT,$0-80
MOVD $syscall·Syscall6(SB), R31
MOVD R31, CTR
MOVD $syscall·Syscall6(SB), R12
MOVD R12, CTR
JMP (CTR)
TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
@@ -39,13 +39,13 @@ TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
RET
TEXT ·RawSyscall(SB),NOSPLIT,$0-56
MOVD $syscall·RawSyscall(SB), R31
MOVD R31, CTR
MOVD $syscall·RawSyscall(SB), R12
MOVD R12, CTR
JMP (CTR)
TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
MOVD $syscall·RawSyscall6(SB), R31
MOVD R31, CTR
MOVD $syscall·RawSyscall6(SB), R12
MOVD R12, CTR
JMP (CTR)
TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
-11
View File
@@ -35,14 +35,3 @@ const (
QUOTA_LIMITS_HARDWS_MAX_DISABLE = 0x00000008
QUOTA_LIMITS_HARDWS_MAX_ENABLE = 0x00000004
)
type MemoryBasicInformation struct {
BaseAddress uintptr
AllocationBase uintptr
AllocationProtect uint32
PartitionId uint16
RegionSize uintptr
State uint32
Protect uint32
Type uint32
}
+14 -14
View File
@@ -53,56 +53,56 @@ var (
func regConnectRegistry(machinename *uint16, key syscall.Handle, result *syscall.Handle) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegConnectRegistryW.Addr(), uintptr(unsafe.Pointer(machinename)), uintptr(key), uintptr(unsafe.Pointer(result)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regCreateKeyEx(key syscall.Handle, subkey *uint16, reserved uint32, class *uint16, options uint32, desired uint32, sa *syscall.SecurityAttributes, result *syscall.Handle, disposition *uint32) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegCreateKeyExW.Addr(), uintptr(key), uintptr(unsafe.Pointer(subkey)), uintptr(reserved), uintptr(unsafe.Pointer(class)), uintptr(options), uintptr(desired), uintptr(unsafe.Pointer(sa)), uintptr(unsafe.Pointer(result)), uintptr(unsafe.Pointer(disposition)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regDeleteKey(key syscall.Handle, subkey *uint16) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegDeleteKeyW.Addr(), uintptr(key), uintptr(unsafe.Pointer(subkey)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regDeleteValue(key syscall.Handle, name *uint16) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegDeleteValueW.Addr(), uintptr(key), uintptr(unsafe.Pointer(name)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regEnumValue(key syscall.Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegEnumValueW.Addr(), uintptr(key), uintptr(index), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(valtype)), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(buflen)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regLoadMUIString(key syscall.Handle, name *uint16, buf *uint16, buflen uint32, buflenCopied *uint32, flags uint32, dir *uint16) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegLoadMUIStringW.Addr(), uintptr(key), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buf)), uintptr(buflen), uintptr(unsafe.Pointer(buflenCopied)), uintptr(flags), uintptr(unsafe.Pointer(dir)))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
func regSetValueEx(key syscall.Handle, valueName *uint16, reserved uint32, vtype uint32, buf *byte, bufsize uint32) (regerrno error) {
r0, _, _ := syscall.SyscallN(procRegSetValueExW.Addr(), uintptr(key), uintptr(unsafe.Pointer(valueName)), uintptr(reserved), uintptr(vtype), uintptr(unsafe.Pointer(buf)), uintptr(bufsize))
if r0 != 0 {
regerrno = syscall.Errno(r0)
if uint32(r0) != 0 {
regerrno = syscall.Errno(uint32(r0))
}
return
}
+5 -5
View File
@@ -1805,7 +1805,7 @@ type PSAPI_WORKING_SET_EX_BLOCK uint64
// Valid returns the validity of this page.
// If this bit is 1, the subsequent members are valid; otherwise they should be ignored.
func (b PSAPI_WORKING_SET_EX_BLOCK) Valid() bool {
return (b & 1) == 1
return (b & 1) != 0
}
// ShareCount is the number of processes that share this page. The maximum value of this member is 7.
@@ -1822,7 +1822,7 @@ func (b PSAPI_WORKING_SET_EX_BLOCK) Win32Protection() uint64 {
// Shared returns the shared status of this page.
// If this bit is 1, the page can be shared.
func (b PSAPI_WORKING_SET_EX_BLOCK) Shared() bool {
return (b & (1 << 15)) == 1
return (b & (1 << 15)) != 0
}
// Node is the NUMA node. The maximum value of this member is 63.
@@ -1833,19 +1833,19 @@ func (b PSAPI_WORKING_SET_EX_BLOCK) Node() uint64 {
// Locked returns the locked status of this page.
// If this bit is 1, the virtual page is locked in physical memory.
func (b PSAPI_WORKING_SET_EX_BLOCK) Locked() bool {
return (b & (1 << 22)) == 1
return (b & (1 << 22)) != 0
}
// LargePage returns the large page status of this page.
// If this bit is 1, the page is a large page.
func (b PSAPI_WORKING_SET_EX_BLOCK) LargePage() bool {
return (b & (1 << 23)) == 1
return (b & (1 << 23)) != 0
}
// Bad returns the bad status of this page.
// If this bit is 1, the page is has been reported as bad.
func (b PSAPI_WORKING_SET_EX_BLOCK) Bad() bool {
return (b & (1 << 31)) == 1
return (b & (1 << 31)) != 0
}
// intField extracts an integer field in the PSAPI_WORKING_SET_EX_BLOCK union.
+10
View File
@@ -33,3 +33,13 @@ type JOBOBJECT_BASIC_LIMIT_INFORMATION struct {
SchedulingClass uint32
_ uint32 // pad to 8 byte boundary
}
type MemoryBasicInformation struct {
BaseAddress uintptr
AllocationBase uintptr
AllocationProtect uint32
RegionSize uintptr
State uint32
Protect uint32
Type uint32
}
+11
View File
@@ -32,3 +32,14 @@ type JOBOBJECT_BASIC_LIMIT_INFORMATION struct {
PriorityClass uint32
SchedulingClass uint32
}
type MemoryBasicInformation struct {
BaseAddress uintptr
AllocationBase uintptr
AllocationProtect uint32
PartitionId uint16
RegionSize uintptr
State uint32
Protect uint32
Type uint32
}
+11
View File
@@ -32,3 +32,14 @@ type JOBOBJECT_BASIC_LIMIT_INFORMATION struct {
PriorityClass uint32
SchedulingClass uint32
}
type MemoryBasicInformation struct {
BaseAddress uintptr
AllocationBase uintptr
AllocationProtect uint32
PartitionId uint16
RegionSize uintptr
State uint32
Protect uint32
Type uint32
}
+388 -388
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -415,7 +415,7 @@ golang.org/x/net/trace
# golang.org/x/sync v0.24.0
## explicit; go 1.26.0
golang.org/x/sync/errgroup
# golang.org/x/sys v0.49.0
# golang.org/x/sys v0.49.1-0.20261022125458-f5cb0306ac0e
## explicit; go 1.26.0
golang.org/x/sys/plan9
golang.org/x/sys/unix