From f47c00cf95d7dbbe7147c61a4a6bc20921c3da2c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 4 Jan 2021 13:10:38 -0800 Subject: [PATCH] syscall: don't define sys_SETREUID and friends We don't use them, since we always call the C library functions which do the right thing anyhow. And they aren't defined on all GNU/Linux variants. Fixes PR go/98510 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/281473 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/syscall/setuidgid_32_linux.go | 6 ------ libgo/go/syscall/setuidgid_linux.go | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c80f1cc1425..094b8fad483 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5b075d039a20f32b9c2711ca67a3e52fba74f957 +a2578eb3983514641f0baf44d27d6474d3a96758 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/syscall/setuidgid_32_linux.go b/libgo/go/syscall/setuidgid_32_linux.go index b0b7f61d221..1fe7120d1c6 100644 --- a/libgo/go/syscall/setuidgid_32_linux.go +++ b/libgo/go/syscall/setuidgid_32_linux.go @@ -12,10 +12,4 @@ const ( sys_SETGID = SYS_SETGID32 sys_SETUID = SYS_SETUID32 - - sys_SETREGID = SYS_SETREGID32 - sys_SETREUID = SYS_SETREUID32 - - sys_SETRESGID = SYS_SETRESGID32 - sys_SETRESUID = SYS_SETRESUID32 ) diff --git a/libgo/go/syscall/setuidgid_linux.go b/libgo/go/syscall/setuidgid_linux.go index 38c83c92f97..22fa334bfa5 100644 --- a/libgo/go/syscall/setuidgid_linux.go +++ b/libgo/go/syscall/setuidgid_linux.go @@ -12,10 +12,4 @@ const ( sys_SETGID = SYS_SETGID sys_SETUID = SYS_SETUID - - sys_SETREGID = SYS_SETREGID - sys_SETREUID = SYS_SETREUID - - sys_SETRESGID = SYS_SETRESGID - sys_SETRESUID = SYS_SETRESUID ) -- 2.30.2