diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-31 14:19:26 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-31 14:19:26 +0000 |
| commit | 69731ab373b0196a860cee9bed9790c2f9ac43c9 (patch) | |
| tree | 3c346b226b18b11dacfcf19842e8774607b5b988 /libc/sysdeps/unix | |
| parent | 978560d2d59061c18105088eefd568c7a5ac3b4b (diff) | |
Merge changes between r18832 and r18863 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18864 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix')
| -rw-r--r-- | libc/sysdeps/unix/inet/syscalls.list | 2 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/connect.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 2 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/sa_len.c | 4 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libc/sysdeps/unix/inet/syscalls.list b/libc/sysdeps/unix/inet/syscalls.list index df2f34eea..aafafd1df 100644 --- a/libc/sysdeps/unix/inet/syscalls.list +++ b/libc/sysdeps/unix/inet/syscalls.list @@ -2,7 +2,7 @@ accept - accept Ci:iBN __libc_accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect __connect_internal connect +connect - connect Ci:ipi __libc_connect __connect connect gethostid - gethostid i: gethostid gethostname - gethostname i:bn __gethostname gethostname getpeername - getpeername i:ibN __getpeername getpeername diff --git a/libc/sysdeps/unix/sysv/linux/connect.S b/libc/sysdeps/unix/sysv/linux/connect.S index 7d1fa12b3..21fc4a64c 100644 --- a/libc/sysdeps/unix/sysv/linux/connect.S +++ b/libc/sysdeps/unix/sysv/linux/connect.S @@ -3,5 +3,5 @@ #define NARGS 3 #define NEED_CANCELLATION #include <socket.S> -strong_alias (__libc_connect, __connect_internal) weak_alias (__libc_connect, __connect) +libc_hidden_weak (__connect) diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list index 791ab9ba5..b826c5d07 100644 --- a/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list +++ b/libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list @@ -18,7 +18,7 @@ semctl - semctl i:iiii __semctl semctl # proper socket implementations: accept - accept Ci:iBN __libc_accept __accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect_internal __connect connect +connect - connect Ci:ipi __libc_connect __connect connect getpeername - getpeername i:ipp __getpeername getpeername getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt diff --git a/libc/sysdeps/unix/sysv/linux/sa_len.c b/libc/sysdeps/unix/sysv/linux/sa_len.c index fdd721018..9ff87dc6f 100644 --- a/libc/sysdeps/unix/sysv/linux/sa_len.c +++ b/libc/sysdeps/unix/sysv/linux/sa_len.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2002, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -60,4 +60,4 @@ __libc_sa_len (sa_family_t af) } return 0; } -INTDEF(__libc_sa_len) +libc_hidden_def (__libc_sa_len) diff --git a/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list index ccddb8422..2e4135f50 100644 --- a/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list +++ b/libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list @@ -20,7 +20,7 @@ syscall_clock_gettime EXTRA clock_gettime Ei:ip __syscall_clock_gettime # proper socket implementations: accept - accept Ci:iBN __libc_accept __accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect_internal __connect connect +connect - connect Ci:ipi __libc_connect __connect connect getpeername - getpeername i:ipp __getpeername getpeername getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt |