From b2bffca2e3b59dd882039e3b0ab835d127bdaf7a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 May 2002 00:22:23 +0000 Subject: Update. 2002-05-11 Jakub Jelinek * include/netinet/in.h (bindresvport_internal): Add prototype. * include/rpc/auth.h (authunix_create_internal, authunix_create_default_internal, authnone_create_internal, authdes_pk_create_internal): Add prototypes. * include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal, clntudp_create_internal, clntudp_bufcreate_internal, clntunix_create_internal): Add prototypes. * include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal, svc_getreq_internal, svc_getreq_common_internal, svc_getreqset_internal, svc_getreq_poll_internal, svc_register_internal, svc_unregister_internal, svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes. * include/rpc/svc_auth.h (_authenticate_internal): Add prototype. * include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg, __setsockopt, __getsockname, __bind, __listen): Add prototypes. * inet/rexec.c (rexec_af): Use __listen and __getsockname. * inet/rcmd.c (rcmd_af): Use __listen. (rresvport_af): Use __bind. * sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport, authunix_create, authunix_create_default, authnone_create, authdes_pk_create, clnt_create, clnttcp_create, clntudp_create, clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode, svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll, svc_register, svc_unregister, svcudp_create, svcudp_bufcreate, _authenticate, add INTDEF after such function definitions. Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg, __setsockopt, __getsockname instead of non-__ variants. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/svc_auth.c: Likewise. * sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases, __register_frame_info_table_bases, __deregister_frame_info_bases): Add INTDEF. (__register_frame_info_bases_internal, __register_frame_info_table_bases_internal, __deregister_frame_info_bases_internal): Add prototypes. (__register_frame_info, __register_frame): Use INTUSE in call to __register_frame_info_bases. (__register_frame_info_table): Similarly. (__deregister_frame_info, __deregister_frame): Similarly. * sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add sendto as weak alias. * sysdeps/mach/hurd/sendto.c: Likewise. * sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add recvfrom as weak alias. * sysdeps/mach/hurd/recvfrom.c: Likewise. * sysdeps/unix/sysv/aix/recvfrom.c: Likewise. * sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add recvmsg as weak alias. * sysdeps/unix/sysv/aix/recvmsg.c: Likewise. * sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add sendmsg as weak alias. * sysdeps/unix/sysv/aix/sendmsg.c: Likewise. * sysdeps/generic/setsockopt.c (__setsockopt): Renamed from setsockopt, add setsockopt as weak alias. * sysdeps/mach/hurd/setsockopt.c: Likewise. * sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as weak alias. * sysdeps/mach/hurd/bind.c: Likewise. * sysdeps/generic/listen.c (__listen): Renamed from listen, add listen as weak alias. * sysdeps/mach/hurd/listen.c: Likewise. * sysdeps/generic/getsockname.c (__getsockname): Renamed from getsockname, add getsockname as weak alias. * sysdeps/mach/hurd/getsockname.c: Likewise. * sysdeps/unix/sysv/aix/getsockname.c: Likewise. * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias. * sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias. * sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg, __recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases. * sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg): Add aliases. * 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/x86_64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias. * sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise. * sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise. * sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise. * sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise. * sysdeps/unix/sysv/linux/bind.S (__bind): Likewise. * sysdeps/unix/sysv/linux/listen.S (__listen): Likewise. * sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise. 2002-05-10 Jakub Jelinek * locale/programs/localedef.h (show_archive_content): Add verbose argument. * locale/programs/localedef.c (main): Adjust caller. * locale/programs/locarchive.c (struct nameent, struct dataent): New. (nameentcmp, dataentcmp): New functions. (xstrcmp): Remove. (show_archive_content): Print verbose listing with --list-archive -v. * locale/programs/locarchive.c (open_archive): Take extra argument readonly. If true open file with O_RDONLY and don't create the archive if it doesn't exist. Adapt all callers. (close_archive): Don't do anything if fd element is -1. * locale/programs/localedef.h (open_archive): Adjust prototype. * locale/programs/locfile.c (write_all_categories): Adjust open_archive call. * malloc/malloc.c (__posix_memalign): Correct check for size of alignment value [PR libc/3444]. --- sysdeps/generic/bind.c | 5 +++-- sysdeps/generic/getsockname.c | 5 +++-- sysdeps/generic/listen.c | 5 +++-- sysdeps/generic/recvfrom.c | 6 ++++-- sysdeps/generic/recvmsg.c | 6 ++++-- sysdeps/generic/sendmsg.c | 6 ++++-- sysdeps/generic/sendto.c | 6 ++++-- sysdeps/generic/setsockopt.c | 6 ++++-- sysdeps/generic/unwind-dw2-fde.c | 22 ++++++++++++++++------ sysdeps/mach/hurd/bind.c | 4 +++- sysdeps/mach/hurd/getsockname.c | 6 ++++-- sysdeps/mach/hurd/listen.c | 7 ++++--- sysdeps/mach/hurd/recvfrom.c | 6 ++++-- sysdeps/mach/hurd/recvmsg.c | 3 ++- sysdeps/mach/hurd/sendmsg.c | 3 ++- sysdeps/mach/hurd/sendto.c | 14 ++++++++------ sysdeps/mach/hurd/setsockopt.c | 13 +++++++------ sysdeps/unix/inet/syscalls.list | 14 +++++++------- sysdeps/unix/sysv/aix/getsockname.c | 6 ++++-- sysdeps/unix/sysv/aix/recvfrom.c | 8 +++++--- sysdeps/unix/sysv/aix/recvmsg.c | 6 ++++-- sysdeps/unix/sysv/aix/sendmsg.c | 7 +++++-- sysdeps/unix/sysv/linux/alpha/syscalls.list | 4 ++-- sysdeps/unix/sysv/linux/bind.S | 1 + sysdeps/unix/sysv/linux/getsockname.S | 1 + sysdeps/unix/sysv/linux/hppa/syscalls.list | 4 ++-- sysdeps/unix/sysv/linux/ia64/syscalls.list | 4 ++-- sysdeps/unix/sysv/linux/listen.S | 1 + sysdeps/unix/sysv/linux/recvfrom.S | 1 + sysdeps/unix/sysv/linux/recvmsg.S | 1 + sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 4 ++-- sysdeps/unix/sysv/linux/sendmsg.S | 1 + sysdeps/unix/sysv/linux/sendto.S | 1 + sysdeps/unix/sysv/linux/setsockopt.S | 1 + sysdeps/unix/sysv/linux/x86_64/syscalls.list | 4 ++-- 35 files changed, 122 insertions(+), 70 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/generic/bind.c b/sysdeps/generic/bind.c index f51b1d8bc1..382e29db16 100644 --- a/sysdeps/generic/bind.c +++ b/sysdeps/generic/bind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2002 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 @@ -21,7 +21,7 @@ /* Give the socket FD the local address ADDR (which is LEN bytes long). */ int -bind (fd, addr, len) +__bind (fd, addr, len) int fd; __CONST_SOCKADDR_ARG addr; socklen_t len; @@ -30,6 +30,7 @@ bind (fd, addr, len) return -1; } +weak_alias (__bind, bind) stub_warning (bind) #include diff --git a/sysdeps/generic/getsockname.c b/sysdeps/generic/getsockname.c index f27fa324af..b698bdbb7a 100644 --- a/sysdeps/generic/getsockname.c +++ b/sysdeps/generic/getsockname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2002 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 @@ -21,7 +21,7 @@ /* Put the local address of FD into *ADDR and its length in *LEN. */ int -getsockname (fd, addr, len) +__getsockname (fd, addr, len) int fd; __SOCKADDR_ARG addr; socklen_t *len; @@ -30,6 +30,7 @@ getsockname (fd, addr, len) return -1; } +weak_alias (__getsockname, getsockname) stub_warning (getsockname) #include diff --git a/sysdeps/generic/listen.c b/sysdeps/generic/listen.c index 87484fecb1..cbdd8b9d18 100644 --- a/sysdeps/generic/listen.c +++ b/sysdeps/generic/listen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,2001,2002 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 @@ -23,7 +23,7 @@ N connection requests will be queued before further requests are refused. Returns 0 on success, -1 for errors. */ int -listen (fd, n) +__listen (fd, n) int fd; int n; { @@ -31,6 +31,7 @@ listen (fd, n) return -1; } +weak_alias (__listen, listen) stub_warning (listen) #include diff --git a/sysdeps/generic/recvfrom.c b/sysdeps/generic/recvfrom.c index da6cc79a01..4f6a045077 100644 --- a/sysdeps/generic/recvfrom.c +++ b/sysdeps/generic/recvfrom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,2001,2002 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 @@ -23,7 +23,7 @@ at address ADDR (which is ADDR_LEN bytes long). Returns the number read or -1 for errors. */ ssize_t -recvfrom (fd, buf, n, flags, addr, addr_len) +__recvfrom (fd, buf, n, flags, addr, addr_len) int fd; void *buf; size_t n; @@ -35,5 +35,7 @@ recvfrom (fd, buf, n, flags, addr, addr_len) return -1; } +weak_alias (__recvfrom, recvfrom) + stub_warning (recvfrom) #include diff --git a/sysdeps/generic/recvmsg.c b/sysdeps/generic/recvmsg.c index 211b844d10..419415cd75 100644 --- a/sysdeps/generic/recvmsg.c +++ b/sysdeps/generic/recvmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,2001,2002 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 @@ -22,7 +22,7 @@ /* Receive a message as described by MESSAGE from socket FD. Returns the number of bytes read or -1 for errors. */ ssize_t -recvmsg (fd, message, flags) +__recvmsg (fd, message, flags) int fd; struct msghdr *message; int flags; @@ -31,5 +31,7 @@ recvmsg (fd, message, flags) return -1; } +weak_alias (__recvmsg, recvmsg) + stub_warning (recvmsg) #include diff --git a/sysdeps/generic/sendmsg.c b/sysdeps/generic/sendmsg.c index 36948f75bd..a4a3cea950 100644 --- a/sysdeps/generic/sendmsg.c +++ b/sysdeps/generic/sendmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,2001,2002 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 @@ -22,7 +22,7 @@ /* Send a message described MESSAGE on socket FD. Returns the number of bytes sent, or -1 for errors. */ ssize_t -sendmsg (fd, message, flags) +__sendmsg (fd, message, flags) int fd; const struct msghdr *message; int flags; @@ -31,5 +31,7 @@ sendmsg (fd, message, flags) return -1; } +weak_alias (__sendmsg, sendmsg) + stub_warning (sendmsg) #include diff --git a/sysdeps/generic/sendto.c b/sysdeps/generic/sendto.c index a9c0df9420..823c9dd1c7 100644 --- a/sysdeps/generic/sendto.c +++ b/sysdeps/generic/sendto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,2001,2002 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 @@ -22,7 +22,7 @@ /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ ssize_t -sendto (fd, buf, n, flags, addr, addr_len) +__sendto (fd, buf, n, flags, addr, addr_len) int fd; __const __ptr_t buf; size_t n; @@ -34,5 +34,7 @@ sendto (fd, buf, n, flags, addr, addr_len) return -1; } +weak_alias (__sendto, sendto) + stub_warning (sendto) #include diff --git a/sysdeps/generic/setsockopt.c b/sysdeps/generic/setsockopt.c index e33387ba01..aca73623fe 100644 --- a/sysdeps/generic/setsockopt.c +++ b/sysdeps/generic/setsockopt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,1998,2002 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 @@ -23,7 +23,7 @@ to *OPTVAL (which is OPTLEN bytes long). Returns 0 on success, -1 for errors. */ int -setsockopt (fd, level, optname, optval, optlen) +__setsockopt (fd, level, optname, optval, optlen) int fd; int level; int optname; @@ -34,5 +34,7 @@ setsockopt (fd, level, optname, optval, optlen) return -1; } +weak_alias (__setsockopt, setsockopt) + stub_warning (setsockopt) #include diff --git a/sysdeps/generic/unwind-dw2-fde.c b/sysdeps/generic/unwind-dw2-fde.c index 3d1931868f..6c51c6f730 100644 --- a/sysdeps/generic/unwind-dw2-fde.c +++ b/sysdeps/generic/unwind-dw2-fde.c @@ -68,6 +68,13 @@ __libc_lock_define_initialized (static, object_mutex) #define __gthread_mutex_lock(m) __libc_lock_lock (*(m)) #define __gthread_mutex_unlock(m) __libc_lock_unlock (*(m)) +void __register_frame_info_bases_internal (void *begin, struct object *ob, + void *tbase, void *dbase); +void __register_frame_info_table_bases_internal (void *begin, + struct object *ob, + void *tbase, void *dbase); +void *__deregister_frame_info_bases_internal (void *begin); + #else #ifdef __GTHREAD_MUTEX_INIT @@ -120,11 +127,12 @@ __register_frame_info_bases (void *begin, struct object *ob, __gthread_mutex_unlock (&object_mutex); } +INTDEF(__register_frame_info_bases) void __register_frame_info (void *begin, struct object *ob) { - __register_frame_info_bases (begin, ob, 0, 0); + INTUSE(__register_frame_info_bases) (begin, ob, 0, 0); } void @@ -137,7 +145,7 @@ __register_frame (void *begin) return; ob = (struct object *) malloc (sizeof (struct object)); - __register_frame_info (begin, ob); + INTUSE(__register_frame_info_bases) (begin, ob, 0, 0); } /* Similar, but BEGIN is actually a pointer to a table of unwind entries @@ -164,18 +172,19 @@ __register_frame_info_table_bases (void *begin, struct object *ob, __gthread_mutex_unlock (&object_mutex); } +INTDEF(__register_frame_info_table_bases) void __register_frame_info_table (void *begin, struct object *ob) { - __register_frame_info_table_bases (begin, ob, 0, 0); + INTUSE(__register_frame_info_table_bases) (begin, ob, 0, 0); } void __register_frame_table (void *begin) { struct object *ob = (struct object *) malloc (sizeof (struct object)); - __register_frame_info_table (begin, ob); + INTUSE(__register_frame_info_table_bases) (begin, ob, 0, 0); } /* Called from crtbegin.o to deregister the unwind info for an object. */ @@ -239,11 +248,12 @@ __deregister_frame_info_bases (void *begin) __gthread_mutex_unlock (&object_mutex); return (void *) ob; } +INTDEF(__deregister_frame_info_bases) void * __deregister_frame_info (void *begin) { - return __deregister_frame_info_bases (begin); + return INTUSE(__deregister_frame_info_bases) (begin); } void @@ -251,7 +261,7 @@ __deregister_frame (void *begin) { /* If .eh_frame is empty, we haven't registered. */ if (*(uword *)begin != 0) - free (__deregister_frame_info (begin)); + free (INTUSE(__deregister_frame_info_bases) (begin)); } diff --git a/sysdeps/mach/hurd/bind.c b/sysdeps/mach/hurd/bind.c index 8b08a6bafa..a42b78ac07 100644 --- a/sysdeps/mach/hurd/bind.c +++ b/sysdeps/mach/hurd/bind.c @@ -30,7 +30,7 @@ /* Give the socket FD the local address ADDR (which is LEN bytes long). */ int -bind (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len) +__bind (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len) { addr_port_t aport; error_t err; @@ -121,3 +121,5 @@ bind (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len) return err ? __hurd_dfail (fd, err) : 0; } + +weak_alias (__bind, bind) diff --git a/sysdeps/mach/hurd/getsockname.c b/sysdeps/mach/hurd/getsockname.c index 7c81ed52fd..dd0dddaed9 100644 --- a/sysdeps/mach/hurd/getsockname.c +++ b/sysdeps/mach/hurd/getsockname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1994, 1997, 1999, 2002 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 @@ -25,7 +25,7 @@ /* Put the local address of FD into *ADDR and its length in *LEN. */ int -getsockname (fd, addrarg, len) +__getsockname (fd, addrarg, len) int fd; __SOCKADDR_ARG addrarg; socklen_t *len; @@ -59,3 +59,5 @@ getsockname (fd, addrarg, len) return 0; } + +weak_alias (__getsockname, getsockname) diff --git a/sysdeps/mach/hurd/listen.c b/sysdeps/mach/hurd/listen.c index 46cb68af54..8ee2650bea 100644 --- a/sysdeps/mach/hurd/listen.c +++ b/sysdeps/mach/hurd/listen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1997, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1994, 1997, 2001, 2002 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 @@ -26,9 +26,8 @@ N connection requests will be queued before further requests are refused. Returns 0 on success, -1 for errors. */ -/* XXX should be __listen ? */ int -listen (fd, n) +__listen (fd, n) int fd; int n; { @@ -37,3 +36,5 @@ listen (fd, n) return __hurd_dfail (fd, err); return 0; } + +weak_alias (__listen, listen) diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c index 8816ad44fc..d5c73f4441 100644 --- a/sysdeps/mach/hurd/recvfrom.c +++ b/sysdeps/mach/hurd/recvfrom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 1999, 2001, 2002 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 @@ -28,7 +28,7 @@ the sender, and store the actual size of the address in *ADDR_LEN. Returns the number of bytes read or -1 for errors. */ ssize_t -recvfrom (fd, buf, n, flags, addrarg, addr_len) +__recvfrom (fd, buf, n, flags, addrarg, addr_len) int fd; void *buf; size_t n; @@ -103,3 +103,5 @@ recvfrom (fd, buf, n, flags, addrarg, addr_len) return nread; } + +weak_alias (__recvfrom, recvfrom) diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c index 73cd03c6d4..2878ef68c7 100644 --- a/sysdeps/mach/hurd/recvmsg.c +++ b/sysdeps/mach/hurd/recvmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002 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 @@ -142,3 +142,4 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags) } weak_alias (__libc_recvmsg, recvmsg) +weak_alias (__libc_recvmsg, __recvmsg) diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c index c55b559e29..9464d3f6c1 100644 --- a/sysdeps/mach/hurd/sendmsg.c +++ b/sysdeps/mach/hurd/sendmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002 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 @@ -150,3 +150,4 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags) } weak_alias (__libc_sendmsg, sendmsg) +weak_alias (__libc_sendmsg, __sendmsg) diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c index 50bb77172c..0a6912a3b7 100644 --- a/sysdeps/mach/hurd/sendto.c +++ b/sysdeps/mach/hurd/sendto.c @@ -27,12 +27,12 @@ /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ ssize_t -sendto (int fd, - const void *buf, - size_t n, - int flags, - const struct sockaddr_un *addr, - socklen_t addr_len) +__sendto (int fd, + const void *buf, + size_t n, + int flags, + const struct sockaddr_un *addr, + socklen_t addr_len) { addr_port_t aport; error_t err; @@ -81,3 +81,5 @@ sendto (int fd, return err ? __hurd_dfail (fd, err) : wrote; } + +weak_alias (__sendto, sendto) diff --git a/sysdeps/mach/hurd/setsockopt.c b/sysdeps/mach/hurd/setsockopt.c index 9875e96311..8ca7f0c724 100644 --- a/sysdeps/mach/hurd/setsockopt.c +++ b/sysdeps/mach/hurd/setsockopt.c @@ -25,13 +25,12 @@ /* Set socket FD's option OPTNAME at protocol level LEVEL to *OPTVAL (which is OPTLEN bytes long). Returns 0 on success, -1 for errors. */ -/* XXX __setsockopt ? */ int -setsockopt (int fd, - int level, - int optname, - const void *optval, - socklen_t optlen) +__setsockopt (int fd, + int level, + int optname, + const void *optval, + socklen_t optlen) { error_t err = HURD_DPORT_USE (fd, __socket_setopt (port, level, optname, @@ -40,3 +39,5 @@ setsockopt (int fd, return __hurd_dfail (fd, err); return 0; } + +weak_alias (__setsockopt, setsockopt) diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list index 5a02f95f87..d01431d843 100644 --- a/sysdeps/unix/inet/syscalls.list +++ b/sysdeps/unix/inet/syscalls.list @@ -1,23 +1,23 @@ # File name Caller Syscall name # args Strong name Weak names accept - accept i:iBN __libc_accept accept -bind - bind i:ipi bind +bind - bind i:ipi __bind bind connect - connect i:ipi __libc_connect __connect connect gethostid - gethostid i: gethostid gethostname - gethostname i:bn __gethostname gethostname getpeername - getpeername i:ibN getpeername getsockname - getsockname i:ibN getsockname getsockopt - getsockopt i:iiiBN getsockopt -listen - listen i:ii listen +listen - listen i:ii __listen listen recv - recv i:ibni __libc_recv recv -recvfrom - recvfrom i:ibniBN __libc_recvfrom recvfrom -recvmsg - recvmsg i:ipi __libc_recvmsg recvmsg +recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom +recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg send - send i:ibni __libc_send __send send -sendmsg - sendmsg i:ipi __libc_sendmsg sendmsg -sendto - sendto i:ibnibn __libc_sendto sendto +sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg +sendto - sendto i:ibnibn __libc_sendto __sendto sendto sethostid - sethostid i:i sethostid sethostname - sethostname i:pi sethostname -setsockopt - setsockopt i:iiibn setsockopt +setsockopt - setsockopt i:iiibn setsockopt __setsockopt shutdown - shutdown i:ii shutdown socket - socket i:iii socket socketpair - socketpair i:iiif socketpair diff --git a/sysdeps/unix/sysv/aix/getsockname.c b/sysdeps/unix/sysv/aix/getsockname.c index 822f9e98cd..ac1bf34fcb 100644 --- a/sysdeps/unix/sysv/aix/getsockname.c +++ b/sysdeps/unix/sysv/aix/getsockname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002 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 @@ -21,7 +21,9 @@ extern int ngetsockname (int s, void *uap_asa, int *uap_alen); int -getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len) +__getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len) { return ngetsockname (fd, addr.__sockaddr__, len); } + +weak_alias (__getsockname, getsockname) diff --git a/sysdeps/unix/sysv/aix/recvfrom.c b/sysdeps/unix/sysv/aix/recvfrom.c index 08264288d1..08ff1113f4 100644 --- a/sysdeps/unix/sysv/aix/recvfrom.c +++ b/sysdeps/unix/sysv/aix/recvfrom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 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 @@ -22,8 +22,10 @@ extern ssize_t nrecvfrom (int s, void *uap_buf, size_t len, int flags, void *uap_from, socklen_t *uap_fromlenaddr); ssize_t -recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addr, - socklen_t *addr_len) +__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addr, + socklen_t *addr_len) { return nrecvfrom (fd, buf, n, flags, addr.__sockaddr__, addr_len); } + +weak_alias (__recvfrom, recvfrom) diff --git a/sysdeps/unix/sysv/aix/recvmsg.c b/sysdeps/unix/sysv/aix/recvmsg.c index ea5af3557c..201c26741c 100644 --- a/sysdeps/unix/sysv/aix/recvmsg.c +++ b/sysdeps/unix/sysv/aix/recvmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 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 @@ -21,7 +21,9 @@ extern ssize_t nrecvmsg (int s, struct msghdr *uap_msg, int flags); ssize_t -recvmsg (int fd, struct msghdr *message, int flags) +__recvmsg (int fd, struct msghdr *message, int flags) { return nrecvmsg (fd, message, flags); } + +weak_alias (__recvmsg, recvmsg) diff --git a/sysdeps/unix/sysv/aix/sendmsg.c b/sysdeps/unix/sysv/aix/sendmsg.c index 054d374393..5b1baf63a5 100644 --- a/sysdeps/unix/sysv/aix/sendmsg.c +++ b/sysdeps/unix/sysv/aix/sendmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 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 @@ -21,7 +21,10 @@ extern int nsendmsg (int s, const void *uap_msg, int flags); ssize_t -sendmsg (int fd, const struct msghdr *message, int flags) +__sendmsg (int fd, const struct msghdr *message, int flags) { return nsendmsg (fd, message, flags); } + +weak_alias (__sendmsg, sendmsg) + diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index eb64186134..3dc07341e3 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -43,10 +43,10 @@ getsockopt - getsockopt 5 __getsockopt getsockopt 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 - recvmsg 3 __libc_recvmsg __recvmsg recvmsg ptrace - ptrace 4 __ptrace ptrace send - send 4 __libc_send __send send -sendmsg - sendmsg 3 __libc_sendmsg sendmsg +sendmsg - sendmsg 3 __libc_sendmsg __sendmsg sendmsg sendto - sendto 6 __libc_sendto __sendto sendto setsockopt - setsockopt 5 __setsockopt setsockopt shutdown - shutdown 2 __shutdown shutdown diff --git a/sysdeps/unix/sysv/linux/bind.S b/sysdeps/unix/sysv/linux/bind.S index 25ff7ecbfd..7719ad0be8 100644 --- a/sysdeps/unix/sysv/linux/bind.S +++ b/sysdeps/unix/sysv/linux/bind.S @@ -2,3 +2,4 @@ #define NARGS 3 #define NO_WEAK_ALIAS 1 #include +weak_alias (bind, __bind) diff --git a/sysdeps/unix/sysv/linux/getsockname.S b/sysdeps/unix/sysv/linux/getsockname.S index 31d37a4f0a..9ea371ff6e 100644 --- a/sysdeps/unix/sysv/linux/getsockname.S +++ b/sysdeps/unix/sysv/linux/getsockname.S @@ -2,3 +2,4 @@ #define NARGS 3 #define NO_WEAK_ALIAS 1 #include +weak_alias (getsockname, __getsockname) diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list index 2c7a63917d..1c7a20d241 100644 --- a/sysdeps/unix/sysv/linux/hppa/syscalls.list +++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list @@ -23,9 +23,9 @@ getsockopt - getsockopt i:iiiBN __getsockopt getsockopt 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 - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg send - send i:ibni __libc_send __send send -sendmsg - sendmsg i:ipi __libc_sendmsg sendmsg +sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg sendto - sendto i:ibnibn __libc_sendto __sendto sendto setsockopt - setsockopt i:iiibn __setsockopt setsockopt shutdown - shutdown i:ii __shutdown shutdown diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list index f2bd5c0a81..15a93df618 100644 --- a/sysdeps/unix/sysv/linux/ia64/syscalls.list +++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list @@ -39,9 +39,9 @@ getsockopt - getsockopt i:iiiBN __getsockopt getsockopt 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 - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg send - send i:ibni __libc_send __send send -sendmsg - sendmsg i:ipi __libc_sendmsg sendmsg +sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg sendto - sendto i:ibnibn __libc_sendto __sendto sendto setsockopt - setsockopt i:iiibn __setsockopt setsockopt shutdown - shutdown i:ii __shutdown shutdown diff --git a/sysdeps/unix/sysv/linux/listen.S b/sysdeps/unix/sysv/linux/listen.S index 115bf2b2d0..bed6a05f25 100644 --- a/sysdeps/unix/sysv/linux/listen.S +++ b/sysdeps/unix/sysv/linux/listen.S @@ -2,3 +2,4 @@ #define NARGS 2 #define NO_WEAK_ALIAS 1 #include +weak_alias (listen, __listen) diff --git a/sysdeps/unix/sysv/linux/recvfrom.S b/sysdeps/unix/sysv/linux/recvfrom.S index 7d0e2b0ea8..93a3110d0a 100644 --- a/sysdeps/unix/sysv/linux/recvfrom.S +++ b/sysdeps/unix/sysv/linux/recvfrom.S @@ -2,3 +2,4 @@ #define __socket __libc_recvfrom #define NARGS 6 #include +weak_alias (__libc_recvfrom, __recvfrom) diff --git a/sysdeps/unix/sysv/linux/recvmsg.S b/sysdeps/unix/sysv/linux/recvmsg.S index b4125d2caa..98be36be5b 100644 --- a/sysdeps/unix/sysv/linux/recvmsg.S +++ b/sysdeps/unix/sysv/linux/recvmsg.S @@ -2,3 +2,4 @@ #define __socket __libc_recvmsg #define NARGS 3 #include +weak_alias (__libc_recvmsg, __recvmsg) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list index 1dbd61f2df..64f52cc02a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list @@ -34,9 +34,9 @@ getsockopt - getsockopt i:iiiBN __getsockopt getsockopt 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 - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg send - send i:ibni __libc_send __send send -sendmsg - sendmsg i:ipi __libc_sendmsg sendmsg +sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg sendto - sendto i:ibnibn __libc_sendto __sendto sendto setsockopt - setsockopt i:iiibn __setsockopt setsockopt shutdown - shutdown i:ii __shutdown shutdown diff --git a/sysdeps/unix/sysv/linux/sendmsg.S b/sysdeps/unix/sysv/linux/sendmsg.S index 0defce9f9e..c01d9b68e7 100644 --- a/sysdeps/unix/sysv/linux/sendmsg.S +++ b/sysdeps/unix/sysv/linux/sendmsg.S @@ -2,3 +2,4 @@ #define __socket __libc_sendmsg #define NARGS 3 #include +weak_alias (__libc_sendmsg, __sendmsg) diff --git a/sysdeps/unix/sysv/linux/sendto.S b/sysdeps/unix/sysv/linux/sendto.S index f0acb88465..8717b2bac1 100644 --- a/sysdeps/unix/sysv/linux/sendto.S +++ b/sysdeps/unix/sysv/linux/sendto.S @@ -2,3 +2,4 @@ #define __socket __libc_sendto #define NARGS 6 #include +weak_alias (__libc_sendto, __sendto) diff --git a/sysdeps/unix/sysv/linux/setsockopt.S b/sysdeps/unix/sysv/linux/setsockopt.S index 09d9109be2..4e40ccba57 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.S +++ b/sysdeps/unix/sysv/linux/setsockopt.S @@ -2,3 +2,4 @@ #define NARGS 5 #define NO_WEAK_ALIAS 1 #include +weak_alias (setsockopt, __setsockopt) diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list index 4d9f75f7b7..dcb1a090d7 100644 --- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list +++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list @@ -38,8 +38,8 @@ getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt listen - listen i:ii __listen listen recvfrom - recvfrom i:ibniBN __libc_recvfrom __recvfrom recvfrom -recvmsg - recvmsg i:ipi __libc_recvmsg recvmsg -sendmsg - sendmsg i:ipi __libc_sendmsg sendmsg +recvmsg - recvmsg i:ipi __libc_recvmsg __recvmsg recvmsg +sendmsg - sendmsg i:ipi __libc_sendmsg __sendmsg sendmsg sendto - sendto i:ibnibn __libc_sendto __sendto sendto setsockopt - setsockopt i:iiibn __setsockopt setsockopt shutdown - shutdown i:ii __shutdown shutdown -- cgit v1.2.3