aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog23
-rw-r--r--include/libio.h9
-rw-r--r--libio/iolibio.h2
-rw-r--r--libio/libioP.h3
-rw-r--r--sysdeps/generic/morecore.c1
-rw-r--r--sysdeps/unix/bsd/syscalls.list2
-rw-r--r--sysdeps/unix/common/syscalls.list6
-rw-r--r--sysdeps/unix/inet/syscalls.list2
-rw-r--r--sysdeps/unix/syscalls.list20
-rw-r--r--sysdeps/unix/sysv/irix4/syscalls.list4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/syscalls.list6
-rw-r--r--sysdeps/unix/sysv/linux/hppa/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/syscalls.list6
-rw-r--r--sysdeps/unix/sysv/linux/mips/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list8
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list14
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/syscalls.list4
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/syscalls.list2
19 files changed, 74 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f43736da5..6110b9ed52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,29 @@
2002-08-03 Jakub Jelinek <jakub@redhat.com>
+
+ * include/libio.h: New file.
+ * libio/libioP.h (__overflow, __woverflow): Remove libc_hidden_proto.
+ * libio/iolibio.h: #include <libio.h>, not "libio.h".
+ * sysdeps/generic/morecore.c (__sbrk): Add libc_hidden_proto.
+ * sysdeps/unix/bsd/syscalls.list: Remove all __GI_* aliases.
+ * sysdeps/unix/common/syscalls.list: Likewise.
+ * sysdeps/unix/inet/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/irix4/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/linux/syscalls.list: Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/syscalls.list: Likewise.
+ * sysdeps/unix/syscalls.list: Likewise.
+
+2002-08-03 Jakub Jelinek <jakub@redhat.com>
Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (public_cALLOc): Only divide if at least one of
- arguments is big enough to cause an overflow.
+ the arguments is big enough to cause an overflow.
2002-08-03 Ulrich Drepper <drepper@redhat.com>
diff --git a/include/libio.h b/include/libio.h
new file mode 100644
index 0000000000..6dc8dc8fed
--- /dev/null
+++ b/include/libio.h
@@ -0,0 +1,9 @@
+#include <libio/libio.h>
+
+#ifndef _LIBC_LIBIO_H
+#define _LIBC_LIBIO_H
+
+libc_hidden_proto (__overflow)
+libc_hidden_proto (__woverflow)
+
+#endif
diff --git a/libio/iolibio.h b/libio/iolibio.h
index e15523ec05..be04604ded 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -1,4 +1,4 @@
-#include "libio.h"
+#include <libio.h>
/* These emulate stdio functionality, but with a different name
(_IO_ungetc instead of ungetc), and using _IO_FILE instead of FILE. */
diff --git a/libio/libioP.h b/libio/libioP.h
index 9cf1a617aa..9cdfebceb1 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -58,9 +58,6 @@
# define libc_hidden_weak(name)
#endif
-libc_hidden_proto (__overflow)
-libc_hidden_proto (__woverflow)
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/sysdeps/generic/morecore.c b/sysdeps/generic/morecore.c
index 0498378769..23bc7e5597 100644
--- a/sysdeps/generic/morecore.c
+++ b/sysdeps/generic/morecore.c
@@ -31,6 +31,7 @@
#include <stddef.h>
extern __malloc_ptr_t __sbrk __P ((ptrdiff_t increment));
+libc_hidden_proto (__sbrk)
#endif
#ifndef NULL
diff --git a/sysdeps/unix/bsd/syscalls.list b/sysdeps/unix/bsd/syscalls.list
index 651aca7712..e84819dc1f 100644
--- a/sysdeps/unix/bsd/syscalls.list
+++ b/sysdeps/unix/bsd/syscalls.list
@@ -3,7 +3,7 @@
flock - flock 2 __flock flock
getdents - getdirentries 4 __getdirentries getdirentries
getdtsz - getdtablesize 0 __getdtablesize getdtablesize
-getpagesize - getpagesize 0 __getpagesize getpagesize __GI___getpagesize
+getpagesize - getpagesize 0 __getpagesize getpagesize
killpg - killpg 2 killpg
sigblock - sigblock 1 __sigblock sigblock
sigpause - sigpause 1 __sigpause sigpause
diff --git a/sysdeps/unix/common/syscalls.list b/sysdeps/unix/common/syscalls.list
index 9368a421fb..fbe915cebd 100644
--- a/sysdeps/unix/common/syscalls.list
+++ b/sysdeps/unix/common/syscalls.list
@@ -4,14 +4,14 @@ adjtime - adjtime i:pp __adjtime adjtime
fchmod - fchmod i:ii __fchmod fchmod
fchown - fchown i:iii __fchown fchown
ftruncate - ftruncate i:ii __ftruncate ftruncate
-getpgid - getpgrp i:i __getpgid getpgid __GI___getpgid
+getpgid - getpgrp i:i __getpgid getpgid
getrusage - getrusage i:ip __getrusage getrusage
gettimeofday - gettimeofday i:PP __gettimeofday gettimeofday __gettimeofday_internal
settimeofday - settimeofday i:PP __settimeofday settimeofday
-setpgid - setpgrp i:ii __setpgid setpgid __GI___setpgid
+setpgid - setpgrp i:ii __setpgid setpgid
setregid - setregid i:ii __setregid setregid
setreuid - setreuid i:ii __setreuid setreuid
-sigaction - sigaction i:ipp __sigaction sigaction __GI___sigaction
+sigaction - sigaction i:ipp __sigaction sigaction
sys_lstat lxstat lstat i:sp __syscall_lstat
truncate - truncate i:si truncate
vhangup - vhangup i:i vhangup
diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list
index 20f1cd7db1..2efafa4cdf 100644
--- a/sysdeps/unix/inet/syscalls.list
+++ b/sysdeps/unix/inet/syscalls.list
@@ -12,7 +12,7 @@ listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv recv
recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg
-send - send i:ibni __libc_send __send send __GI___send
+send - send i:ibni __libc_send __send send
sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg
sendto - sendto i:ibnibn __libc_sendto __sendto sendto
sethostid - sethostid i:i sethostid
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 9e5a885696..19822ebdc0 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -4,20 +4,20 @@ access - access i:si __access access
acct - acct i:S acct
chdir - chdir i:s __chdir chdir
chmod - chmod i:si __chmod chmod
-chown - chown i:sii __chown chown __GI___chown
+chown - chown i:sii __chown chown
chroot - chroot i:s chroot
-close - close i:i __libc_close __close close __GI___close
+close - close i:i __libc_close __close close
dup - dup i:i __dup dup
-dup2 - dup2 i:ii __dup2 dup2 __GI___dup2
+dup2 - dup2 i:ii __dup2 dup2
fchdir - fchdir i:i __fchdir fchdir
-fcntl - fcntl i:iiF __libc_fcntl __GI___libc_fcntl __fcntl __GI___fcntl fcntl
+fcntl - fcntl i:iiF __libc_fcntl __fcntl fcntl
fstatfs - fstatfs i:ip __fstatfs fstatfs
fsync - fsync i:i __libc_fsync fsync
getdomain - getdomainname i:si getdomainname
getgid - getgid i: __getgid getgid
getgroups - getgroups i:ip __getgroups getgroups
getitimer - getitimer i:ip __getitimer getitimer
-getpid - getpid i: __getpid getpid __GI___getpid
+getpid - getpid i: __getpid getpid
getpriority - getpriority i:ii getpriority
getrlimit - getrlimit i:ip __getrlimit getrlimit
getuid - getuid i: __getuid getuid
@@ -26,16 +26,16 @@ kill - kill i:ii __kill kill
link - link i:ss __link link
lseek - lseek i:iii __libc_lseek __lseek lseek
mkdir - mkdir i:si __mkdir mkdir
-open - open i:siv __libc_open __GI___libc_open __open open __GI___open
+open - open i:siv __libc_open __open open
profil - profil i:piii profil
ptrace - ptrace i:iiii ptrace
-read - read i:ibn __libc_read __read read __GI___read __GI___libc_read
+read - read i:ibn __libc_read __read read
readlink - readlink i:spi __readlink readlink
readv - readv i:ipi __readv readv
reboot - reboot i:i reboot
rename - rename i:ss rename
rmdir - rmdir i:s __rmdir rmdir
-select - select i:iPPPP __select select __GI___select
+select - select i:iPPPP __select select
setdomain - setdomainname i:si setdomainname
setegid - setegid i:i __setegid setegid
seteuid - seteuid i:i __seteuid seteuid
@@ -49,7 +49,7 @@ settimeofday - settimeofday i:PP __settimeofday settimeofday
setuid - setuid i:i __setuid setuid
sigsuspend - sigsuspend i:p sigsuspend
sstk - sstk b:i sstk
-statfs - statfs i:sp __statfs statfs __GI___statfs
+statfs - statfs i:sp __statfs statfs
swapoff - swapoff i:s swapoff
swapon - swapon i:s swapon
symlink - symlink i:ss __symlink symlink
@@ -61,5 +61,5 @@ umask - umask i:i __umask umask
uname - uname i:p __uname uname
unlink - unlink i:s __unlink unlink
utimes - utimes i:sp __utimes utimes
-write - write i:ibn __libc_write __write write __GI___write __GI___libc_write
+write - write i:ibn __libc_write __write write
writev - writev i:ipi __writev writev
diff --git a/sysdeps/unix/sysv/irix4/syscalls.list b/sysdeps/unix/sysv/irix4/syscalls.list
index eb22a848b2..a57529e9ad 100644
--- a/sysdeps/unix/sysv/irix4/syscalls.list
+++ b/sysdeps/unix/sysv/irix4/syscalls.list
@@ -1,8 +1,8 @@
# File name Caller Syscall name # args Strong name Weak names
-getpgid - bsdgetpgrp 1 __getpgid getpgid __GI___getpgid
+getpgid - bsdgetpgrp 1 __getpgid getpgid
msync - msync 3 msync
-setpgid - bsdsetpgrp 2 __setpgid setpgid __GI___setpgid
+setpgid - bsdsetpgrp 2 __setpgid setpgid
signal - signal 3 __raw_signal
sysmp - sysmp 4 __sysmp
syssgi - syssgi 2 __syssgi
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 7187f44a03..059f753d2b 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -21,9 +21,9 @@ getpriority - getpriority 2 __getpriority getpriority
mmap - mmap 6 __mmap mmap __mmap64 mmap64
llseek EXTRA lseek 3 __libc_lseek64 __llseek llseek __lseek64 lseek64
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
-pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 __GI___pwrite64
+pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs 2 __fstatfs fstatfs __fstatfs64 fstatfs64
-statfs - statfs 2 __statfs statfs statfs64 __GI___statfs
+statfs - statfs 2 __statfs statfs statfs64
getrlimit - getrlimit 2 __getrlimit getrlimit getrlimit64
setrlimit - setrlimit 2 __setrlimit setrlimit64 setrlimit
ftruncate - ftruncate 2 __ftruncate ftruncate __ftruncate64 ftruncate64
@@ -47,7 +47,7 @@ recv - recv 4 __libc_recv __recv recv
recvfrom - recvfrom 6 __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg 3 __libc_recvmsg __recvmsg recvmsg
ptrace - ptrace 4 __ptrace ptrace
-send - send 4 __libc_send __send send __GI___send
+send - send 4 __libc_send __send send
sendmsg - sendmsg 3 __libc_sendmsg __sendmsg sendmsg
sendto - sendto 6 __libc_sendto __sendto sendto
setsockopt - setsockopt 5 __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
index 0065ff0e29..1c7a20d241 100644
--- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
+++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
@@ -24,7 +24,7 @@ listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv __recv recv
recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg
-send - send i:ibni __libc_send __send send __GI___send
+send - send i:ibni __libc_send __send send
sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg
sendto - sendto i:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index ed4bbd8daa..0aca8a140f 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -5,9 +5,9 @@ umount2 - umount 2 __umount2 umount2
# Whee! 64-bit systems naturally implement llseek.
llseek EXTRA lseek 3 __libc_lseek64 __lseek llseek __lseek64 lseek64
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
-pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 __GI___pwrite64
+pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
-statfs - statfs i:sp __statfs statfs statfs64 __GI___statfs
+statfs - statfs i:sp __statfs statfs statfs64
mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
getpeername - getpeername i:ipp __getpeername getpeername
getpriority - getpriority i:ii __getpriority getpriority
@@ -42,7 +42,7 @@ listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv __recv recv
recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg
-send - send i:ibni __libc_send __send send __GI___send
+send - send i:ibni __libc_send __send send
sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg
sendto - sendto i:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
index 1df662d620..f7d2e291a5 100644
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -24,7 +24,7 @@ listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv __recv recv
recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg
-send - send i:ibni __libc_send __send send __GI___send
+send - send i:ibni __libc_send __send send
sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg
sendto - sendto i:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index cb84900b31..64f52cc02a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -2,7 +2,7 @@
llseek EXTRA lseek 3 __libc_lseek64 __lseek llseek __lseek64 lseek64
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
-pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 __GI___pwrite64
+pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
statfs - statfs i:sp __statfs statfs statfs64
getpeername - getpeername i:ipp __getpeername getpeername
@@ -35,7 +35,7 @@ listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv __recv recv
recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg
-send - send i:ibni __libc_send __send send __GI___send
+send - send i:ibni __libc_send __send send
sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg
sendto - sendto i:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index 072e692fe3..2c76ac04f2 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -3,9 +3,9 @@
# Whee! 64-bit systems naturally implement llseek.
llseek EXTRA lseek 3 __llseek llseek __libc_lseek64 __lseek64 lseek64
pread - pread 4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
-pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 __GI___pwrite64
+pwrite - pwrite 4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs 2 __fstatfs fstatfs __fstatfs64 fstatfs64
-statfs - statfs 2 __statfs statfs statfs64 __GI___statfs
+statfs - statfs 2 __statfs statfs statfs64
getrlimit - getrlimit 2 __getrlimit getrlimit getrlimit64
setrlimit - setrlimit 2 __setrlimit setrlimit64 setrlimit
ftruncate - ftruncate 2 __ftruncate ftruncate __ftruncate64 ftruncate64
@@ -15,7 +15,7 @@ readahead EXTRA readahead 3 __readahead readahead
sendfile - sendfile i:iipi sendfile sendfile64
# Override select.S in parent directory:
-select - select 5 __select select __GI___select
+select - select 5 __select select
accept - accept 3 __libc_accept __accept accept
bind - bind 3 __bind bind
connect - connect 3 __libc_connect __connect_internal __connect connect
@@ -26,7 +26,7 @@ listen - listen 2 __listen listen
recv - recv 4 __libc_recv __recv recv
recvfrom - recvfrom 6 __libc_recvfrom __recvfrom recvfrom
recvmsg - recvmsg 3 __libc_recvmsg __recvmsg recvmsg
-send - send 4 __libc_send __send send __GI___send
+send - send 4 __libc_send __send send
sendmsg - sendmsg 3 __libc_sendmsg __sendmsg sendmsg
sendto - sendto 6 __libc_sendto __sendto sendto
setsockopt - setsockopt 5 __setsockopt setsockopt
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 577d664a2e..8f7bfa32b2 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -12,7 +12,7 @@ fork - fork i: __libc_fork __fork fork
get_kernel_syms EXTRA get_kernel_syms i:p get_kernel_syms
getegid - getegid i: __getegid getegid
geteuid - geteuid i: __geteuid geteuid
-getpgid - getpgid i:i __getpgid getpgid __GI___getpgid
+getpgid - getpgid i:i __getpgid getpgid
getpgrp - getpgrp i: getpgrp
getppid - getppid i: __getppid getppid
getsid - getsid i:i getsid
@@ -34,7 +34,7 @@ nanosleep - nanosleep i:pp __libc_nanosleep __nanosleep nanosleep
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
pause - pause i: __libc_pause pause
personality init-first personality i:i __personality personality
-pipe - pipe i:f __pipe pipe __GI___pipe
+pipe - pipe i:f __pipe pipe
pivot_root EXTRA pivot_root i:ss pivot_root
prctl EXTRA prctl i:iiiii prctl
query_module EXTRA query_module i:sipip query_module
@@ -45,14 +45,14 @@ sched_primax - sched_get_priority_max i:i __sched_get_priority_max sched_get_pri
sched_primin - sched_get_priority_min i:i __sched_get_priority_min sched_get_priority_min
sched_rr_gi - sched_rr_get_interval i:ip __sched_rr_get_interval sched_rr_get_interval
sched_setp - sched_setparam i:ip __sched_setparam sched_setparam
-sched_sets - sched_setscheduler i:iip __sched_setscheduler sched_setscheduler __GI___sched_setscheduler
+sched_sets - sched_setscheduler i:iip __sched_setscheduler sched_setscheduler
sched_yield - sched_yield i: __sched_yield sched_yield
-select - _newselect i:iPPPP __select select __GI___select
+select - _newselect i:iPPPP __select select
sendfile - sendfile i:iipi sendfile
sendfile64 - sendfile64 i:iipi sendfile64
setfsgid EXTRA setfsgid i:i setfsgid
setfsuid EXTRA setfsuid i:i setfsuid
-setpgid - setpgid i:ii __setpgid setpgid __GI___setpgid
+setpgid - setpgid i:ii __setpgid setpgid
setresuid EXTRA setresuid i:iii __setresuid setresuid
setresgid EXTRA setresgid i:iii __setresgid setresgid
sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack
@@ -62,5 +62,5 @@ swapoff - swapoff i:s __swapoff swapoff
uselib EXTRA uselib i:s uselib
wait4 - wait4 i:iWiP __wait4 wait4
-chown - chown i:sii __GI___chown __chown chown
-fcntl - fcntl i:iiF __libc_fcntl __GI___libc_fcntl __fcntl __GI___fcntl fcntl
+chown - chown i:sii __libc_chown __chown chown
+fcntl - fcntl i:iiF __libc_fcntl __fcntl fcntl
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
index 1f1b5e4992..28c07f8cec 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
@@ -5,9 +5,9 @@ mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
llseek EXTRA lseek i:iii __libc_lseek64 __llseek llseek __lseek64 lseek64
pread - pread i:ibni __libc_pread __libc_pread64 __pread pread __pread64 pread64
-pwrite - pwrite i:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 __GI___pwrite64
+pwrite - pwrite i:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
fstatfs - fstatfs i:ip __fstatfs fstatfs __fstatfs64 fstatfs64
-statfs - statfs i:sp __statfs statfs statfs64 __GI___statfs
+statfs - statfs i:sp __statfs statfs statfs64
getresgid - getresgid i:ppp getresgid
getresuid - getresuid i:ppp getresuid
getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list b/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list
index fb08465b37..092d869efc 100644
--- a/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list
+++ b/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list
@@ -1,6 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names
-sigaction - sigaction 3 __sigaction sigaction __GI___sigaction
+sigaction - sigaction 3 __sigaction sigaction
sigaltstack - sigaltstack 2 sigaltstack
sigpending - sigpending 2 __syscall_sigpending
sigqueue - sigqueue 3 __sigqueue sigqueue