aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/syscall/setuidgid_32_linux.go6
-rw-r--r--libgo/go/syscall/setuidgid_linux.go6
3 files changed, 1 insertions, 13 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c80f1cc..094b8fad 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 b0b7f61..1fe7120 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 38c83c9..22fa334 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
)