svn commit: trunk/uClibc: include libc/inet libc/inet/rpc libc/mis etc...
psm at uclibc.org
psm at uclibc.org
Thu Dec 8 21:02:35 UTC 2005
Author: psm
Date: 2005-12-08 13:01:23 -0800 (Thu, 08 Dec 2005)
New Revision: 12765
Log:
mmap/mremap/socket/rewind gone
Modified:
trunk/uClibc/include/libc-internal.h
trunk/uClibc/libc/inet/getaddrinfo.c
trunk/uClibc/libc/inet/getnetent.c
trunk/uClibc/libc/inet/getproto.c
trunk/uClibc/libc/inet/getservice.c
trunk/uClibc/libc/inet/if_nametoindex.c
trunk/uClibc/libc/inet/resolv.c
trunk/uClibc/libc/inet/rpc/clnt_tcp.c
trunk/uClibc/libc/inet/rpc/clnt_udp.c
trunk/uClibc/libc/inet/rpc/clnt_unix.c
trunk/uClibc/libc/inet/rpc/get_myaddress.c
trunk/uClibc/libc/inet/rpc/getrpcent.c
trunk/uClibc/libc/inet/rpc/pmap_clnt.c
trunk/uClibc/libc/inet/rpc/pmap_rmt.c
trunk/uClibc/libc/inet/rpc/rcmd.c
trunk/uClibc/libc/inet/rpc/rexec.c
trunk/uClibc/libc/inet/rpc/rtime.c
trunk/uClibc/libc/inet/rpc/svc_tcp.c
trunk/uClibc/libc/inet/rpc/svc_udp.c
trunk/uClibc/libc/inet/rpc/svc_unix.c
trunk/uClibc/libc/misc/syslog/syslog.c
trunk/uClibc/libc/misc/ttyent/getttyent.c
trunk/uClibc/libc/pwd_grp/pwd_grp.c
trunk/uClibc/libc/stdio/rewind.c
trunk/uClibc/libc/stdlib/malloc-simple/alloc.c
trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
trunk/uClibc/libc/stdlib/malloc-standard/realloc.c
trunk/uClibc/libc/stdlib/malloc/malloc.c
trunk/uClibc/libc/sysdeps/linux/arm/ioperm.c
trunk/uClibc/libc/sysdeps/linux/arm/mmap64.S
trunk/uClibc/libc/sysdeps/linux/common/mmap.c
trunk/uClibc/libc/sysdeps/linux/common/mmap64.c
trunk/uClibc/libc/sysdeps/linux/common/mremap.c
trunk/uClibc/libc/sysdeps/linux/frv/mmap.c
trunk/uClibc/libc/sysdeps/linux/hppa/mmap.c
trunk/uClibc/libc/sysdeps/linux/i386/mmap.S
trunk/uClibc/libc/sysdeps/linux/mips/mmap.c
trunk/uClibc/libc/sysdeps/linux/powerpc/mmap.c
trunk/uClibc/libc/sysdeps/linux/sh/mmap.c
trunk/uClibc/libc/sysdeps/linux/x86_64/mmap.c
trunk/uClibc/libc/unistd/exec.c
Changeset:
Modified: trunk/uClibc/include/libc-internal.h
===================================================================
--- trunk/uClibc/include/libc-internal.h 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/include/libc-internal.h 2005-12-08 21:01:23 UTC (rev 12765)
@@ -198,6 +198,9 @@
/* #include <sys/ioctl.h> */
extern int __ioctl (int __fd, unsigned long int __request, ...) attribute_hidden;
+/* #include <sys/socket.h> */
+extern int __socket (int __domain, int __type, int __protocol) attribute_hidden;
+
# if 0 /* undoable here */
/* #include <dirent.h> */
typedef struct __dirstream DIR;
Modified: trunk/uClibc/libc/inet/getaddrinfo.c
===================================================================
--- trunk/uClibc/libc/inet/getaddrinfo.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/getaddrinfo.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -159,7 +159,7 @@
int s;
int ret;
int saved_errno = errno;
- s = socket(af, SOCK_DGRAM, 0);
+ s = __socket(af, SOCK_DGRAM, 0);
if (s < 0)
ret = (errno == EMFILE) ? 1 : 0;
else
Modified: trunk/uClibc/libc/inet/getnetent.c
===================================================================
--- trunk/uClibc/libc/inet/getnetent.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/getnetent.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -16,6 +16,7 @@
*/
#define inet_network __inet_network
+#define rewind __rewind
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/getproto.c
===================================================================
--- trunk/uClibc/libc/inet/getproto.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/getproto.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -53,6 +53,7 @@
#define strpbrk __strpbrk
#define atoi __atoi
+#define rewind __rewind
#define __FORCE_GLIBC
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/inet/getservice.c
===================================================================
--- trunk/uClibc/libc/inet/getservice.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/getservice.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -53,6 +53,7 @@
#define strpbrk __strpbrk
#define atoi __atoi
+#define rewind __rewind
#define __FORCE_GLIBC
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/inet/if_nametoindex.c
===================================================================
--- trunk/uClibc/libc/inet/if_nametoindex.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/if_nametoindex.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -32,10 +32,10 @@
{
int fd;
#ifdef __UCLIBC_HAS_IPV6__
- fd=socket(AF_INET6,SOCK_DGRAM,0);
+ fd=__socket(AF_INET6,SOCK_DGRAM,0);
if (fd<0)
#endif /* __UCLIBC_HAS_IPV6__ */
- fd=socket(AF_INET,SOCK_DGRAM,0);
+ fd=__socket(AF_INET,SOCK_DGRAM,0);
return(fd);
}
Modified: trunk/uClibc/libc/inet/resolv.c
===================================================================
--- trunk/uClibc/libc/inet/resolv.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/resolv.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -146,6 +146,8 @@
#define inet_ntop __inet_ntop
#define connect __connect
#define select __select
+#define recv __recv
+#define send __send
#define __FORCE_GLIBC
#include <features.h>
@@ -770,9 +772,9 @@
#ifdef __UCLIBC_HAS_IPV6__
v6 = inet_pton(AF_INET6, dns, &sa6.sin6_addr) > 0;
- fd = socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ fd = __socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP);
#else
- fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ fd = __socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
#endif
if (fd < 0) {
retries++;
Modified: trunk/uClibc/libc/inet/rpc/clnt_tcp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -175,7 +175,7 @@
*/
if (*sockp < 0)
{
- *sockp = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ *sockp = __socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
(void) bindresvport (*sockp, (struct sockaddr_in *) 0);
if ((*sockp < 0)
|| (connect (*sockp, (struct sockaddr *) raddr,
Modified: trunk/uClibc/libc/inet/rpc/clnt_udp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_udp.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/clnt_udp.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -49,6 +49,9 @@
#define _seterr_reply __seterr_reply
#define setsockopt __setsockopt
#define bindresvport __bindresvport
+#define recvfrom __recvfrom
+#define sendto __sendto
+#define recvmsg __recvmsg
#define __FORCE_GLIBC
#include <features.h>
@@ -197,7 +200,7 @@
{
int dontblock = 1;
- *sockp = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ *sockp = __socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (*sockp < 0)
{
struct rpc_createerr *ce = &get_rpc_createerr ();
Modified: trunk/uClibc/libc/inet/rpc/clnt_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -59,6 +59,8 @@
#define _seterr_reply __seterr_reply
#define setsockopt __setsockopt
#define connect __connect
+#define recvmsg __recvmsg
+#define sendmsg __sendmsg
#define __FORCE_GLIBC
#include <features.h>
@@ -158,7 +160,7 @@
*/
if (*sockp < 0)
{
- *sockp = socket (AF_UNIX, SOCK_STREAM, 0);
+ *sockp = __socket (AF_UNIX, SOCK_STREAM, 0);
len = __strlen (raddr->sun_path) + sizeof (raddr->sun_family) + 1;
if (*sockp < 0
|| connect (*sockp, (struct sockaddr *) raddr, len) < 0)
Modified: trunk/uClibc/libc/inet/rpc/get_myaddress.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/get_myaddress.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/get_myaddress.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -65,7 +65,7 @@
struct ifreq ifreq, *ifr;
int len, loopback = 0;
- if ((s = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
+ if ((s = __socket (AF_INET, SOCK_DGRAM, 0)) < 0)
{
__perror ("get_myaddress: socket");
exit (1);
Modified: trunk/uClibc/libc/inet/rpc/getrpcent.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/getrpcent.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/getrpcent.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -34,6 +34,7 @@
*/
#define atoi __atoi
+#define rewind __rewind
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/pmap_clnt.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/pmap_clnt.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/pmap_clnt.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -66,7 +66,7 @@
struct ifreq ifreq, *ifr;
int len, loopback = 1;
- if ((s = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
+ if ((s = __socket (AF_INET, SOCK_DGRAM, 0)) < 0)
{
__perror ("__get_myaddress: socket");
exit (1);
Modified: trunk/uClibc/libc/inet/rpc/pmap_rmt.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/pmap_rmt.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/pmap_rmt.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -49,6 +49,8 @@
#define inet_netof __inet_netof
#define clntudp_create __clntudp_create
#define setsockopt __setsockopt
+#define recvfrom __recvfrom
+#define sendto __sendto
#define __FORCE_GLIBC
#include <features.h>
@@ -274,7 +276,7 @@
* initialization: create a socket, a broadcast address, and
* preserialize the arguments into a send buffer.
*/
- if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ if ((sock = __socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
__perror (_("Cannot create socket for broadcast rpc"));
stat = RPC_CANTSEND;
Modified: trunk/uClibc/libc/inet/rpc/rcmd.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -280,7 +280,7 @@
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = INADDR_ANY;
- s = socket(AF_INET, SOCK_STREAM, 0);
+ s = __socket(AF_INET, SOCK_STREAM, 0);
if (s < 0)
return -1;
for (;;) {
Modified: trunk/uClibc/libc/inet/rpc/rexec.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rexec.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/rexec.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -93,7 +93,7 @@
}
__ruserpass(res0->ai_canonname, &name, &pass);
retry:
- s = socket(res0->ai_family, res0->ai_socktype, 0);
+ s = __socket(res0->ai_family, res0->ai_socktype, 0);
if (s < 0) {
__perror("rexec: socket");
return (-1);
@@ -115,7 +115,7 @@
char num[32];
int s2, sa2len;
- s2 = socket(res0->ai_family, res0->ai_socktype, 0);
+ s2 = __socket(res0->ai_family, res0->ai_socktype, 0);
if (s2 < 0) {
(void) __close(s);
return (-1);
Modified: trunk/uClibc/libc/inet/rpc/rtime.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rtime.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/rtime.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -44,6 +44,8 @@
*/
#define connect __connect
+#define recvfrom __recvfrom
+#define sendto __sendto
#define __FORCE_GLIBC
#include <features.h>
@@ -93,7 +95,7 @@
else
type = SOCK_DGRAM;
- s = socket (AF_INET, type, 0);
+ s = __socket (AF_INET, type, 0);
if (s < 0)
return (-1);
Modified: trunk/uClibc/libc/inet/rpc/svc_tcp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_tcp.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/svc_tcp.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -166,7 +166,7 @@
if (sock == RPC_ANYSOCK)
{
- if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+ if ((sock = __socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
__perror (_("svc_tcp.c - tcp socket creation problem"));
return (SVCXPRT *) NULL;
Modified: trunk/uClibc/libc/inet/rpc/svc_udp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_udp.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/svc_udp.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -48,6 +48,10 @@
#define setsockopt __setsockopt
#define bind __bind
#define bindresvport __bindresvport
+#define recvfrom __recvfrom
+#define sendto __sendto
+#define recvmsg __recvmsg
+#define sendmsg __sendmsg
#define __FORCE_GLIBC
#define _GNU_SOURCE
@@ -135,7 +139,7 @@
if (sock == RPC_ANYSOCK)
{
- if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ if ((sock = __socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
__perror (_("svcudp_create: socket creation problem"));
return (SVCXPRT *) NULL;
Modified: trunk/uClibc/libc/inet/rpc/svc_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -50,6 +50,8 @@
#define getsockname __getsockname
#define setsockopt __setsockopt
#define bind __bind
+#define recvmsg __recvmsg
+#define sendmsg __sendmsg
#define __FORCE_GLIBC
#include <features.h>
@@ -161,7 +163,7 @@
if (sock == RPC_ANYSOCK)
{
- if ((sock = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
+ if ((sock = __socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
__perror (_("svc_unix.c - AF_UNIX socket creation problem"));
return (SVCXPRT *) NULL;
Modified: trunk/uClibc/libc/misc/syslog/syslog.c
===================================================================
--- trunk/uClibc/libc/misc/syslog/syslog.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/misc/syslog/syslog.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -148,7 +148,7 @@
sizeof(SyslogAddr.sa_data));
retry:
if (LogStat & LOG_NDELAY) {
- if ((LogFile = socket(AF_UNIX, logType, 0)) == -1){
+ if ((LogFile = __socket(AF_UNIX, logType, 0)) == -1){
UNLOCK;
return;
}
Modified: trunk/uClibc/libc/misc/ttyent/getttyent.c
===================================================================
--- trunk/uClibc/libc/misc/ttyent/getttyent.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/misc/ttyent/getttyent.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -28,6 +28,7 @@
*/
#define __fsetlocking __fsetlocking_internal
+#define rewind __rewind
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/pwd_grp/pwd_grp.c
===================================================================
--- trunk/uClibc/libc/pwd_grp/pwd_grp.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/pwd_grp/pwd_grp.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -20,6 +20,7 @@
#define setgroups __setgroups
#define strtoul __strtoul
+#define rewind __rewind
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/stdio/rewind.c
===================================================================
--- trunk/uClibc/libc/stdio/rewind.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/stdio/rewind.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -7,7 +7,7 @@
#include "_stdio.h"
-void rewind(register FILE *stream)
+void attribute_hidden __rewind(register FILE *stream)
{
__STDIO_AUTO_THREADLOCK_VAR;
@@ -18,3 +18,4 @@
__STDIO_AUTO_THREADUNLOCK(stream);
}
+strong_alias(__rewind,rewind)
Modified: trunk/uClibc/libc/stdlib/malloc/malloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc/malloc.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/stdlib/malloc/malloc.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -11,6 +11,8 @@
* Written by Miles Bader <miles at gnu.org>
*/
+#define mmap __mmap
+
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
Modified: trunk/uClibc/libc/stdlib/malloc-simple/alloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-simple/alloc.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/stdlib/malloc-simple/alloc.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -6,6 +6,7 @@
* Parts of the memalign code were stolen from malloc-930716.
*/
+#define mmap __mmap
#define munmap __munmap
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/malloc.h 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/stdlib/malloc-standard/malloc.h 2005-12-08 21:01:23 UTC (rev 12765)
@@ -14,6 +14,7 @@
Hacked up for uClibc by Erik Andersen <andersen at codepoet.org>
*/
+#define mmap __mmap
#define sysconf __sysconf
#include <features.h>
Modified: trunk/uClibc/libc/stdlib/malloc-standard/realloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/realloc.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/stdlib/malloc-standard/realloc.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -14,6 +14,8 @@
Hacked up for uClibc by Erik Andersen <andersen at codepoet.org>
*/
+#define mremap __mremap
+
#include "malloc.h"
Modified: trunk/uClibc/libc/sysdeps/linux/arm/ioperm.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/arm/ioperm.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/arm/ioperm.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -34,6 +34,7 @@
enable all the ports all of the time. */
#define readlink __readlink
+#define mmap __mmap
#include <errno.h>
#include <fcntl.h>
Modified: trunk/uClibc/libc/sysdeps/linux/arm/mmap64.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/arm/mmap64.S 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/arm/mmap64.S 2005-12-08 21:01:23 UTC (rev 12765)
@@ -52,10 +52,7 @@
mov r0, ip @ first arg was clobbered
teq r5, $0
ldmeqfd sp!, {r4, r5, lr}
-#ifdef __PIC__
- beq mmap(PLT)
-#else
- beq mmap
+ beq __mmap
#endif
.Linval:
mov r0, $-EINVAL
Modified: trunk/uClibc/libc/sysdeps/linux/common/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/common/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -14,7 +14,7 @@
#ifdef __NR_mmap
#define __NR__mmap __NR_mmap
static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer);
-__ptr_t mmap(__ptr_t addr, size_t len, int prot,
+__ptr_t attribute_hidden __mmap(__ptr_t addr, size_t len, int prot,
int flags, int fd, __off_t offset)
{
unsigned long buffer[6];
@@ -27,4 +27,5 @@
buffer[5] = (unsigned long) offset;
return (__ptr_t) _mmap(buffer);
}
+strong_alias(__mmap,mmap)
#endif
Modified: trunk/uClibc/libc/sysdeps/linux/common/mmap64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/mmap64.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/common/mmap64.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -19,6 +19,8 @@
/* Massivly hacked up for uClibc by Erik Andersen */
+#define mmap __mmap
+
#include <features.h>
#include <errno.h>
#include <unistd.h>
@@ -84,4 +86,3 @@
#endif
#endif /* __UCLIBC_HAS_LFS__ */
-
Modified: trunk/uClibc/libc/sysdeps/linux/common/mremap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/mremap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/common/mremap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -10,5 +10,7 @@
#include "syscalls.h"
#include <unistd.h>
#include <sys/mman.h>
-_syscall4(__ptr_t, mremap, __ptr_t, old_address, size_t, old_size, size_t,
+#define __NR___mremap __NR_mremap
+attribute_hidden _syscall4(__ptr_t, __mremap, __ptr_t, old_address, size_t, old_size, size_t,
new_size, int, may_move);
+strong_alias(__mremap,mremap)
Modified: trunk/uClibc/libc/sysdeps/linux/frv/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/frv/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/frv/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -38,7 +38,7 @@
# define MMAP2_PAGE_SHIFT 12
# endif
-__ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
+__ptr_t attribute_hidden __mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
{
if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) {
__set_errno (EINVAL);
@@ -46,3 +46,4 @@
}
return(__syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT)));
}
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/sysdeps/linux/hppa/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/hppa/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/hppa/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -13,5 +13,7 @@
#include <sys/mman.h>
#include <sys/syscall.h>
-_syscall6(void *, mmap, void *, start, size_t, length, int, prot,
+#define __NR___mmap __NR_mmap
+attribute_hidden _syscall6(void *, __mmap, void *, start, size_t, length, int, prot,
int, flags, int, fd, off_t, offset);
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/sysdeps/linux/i386/mmap.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/mmap.S 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/i386/mmap.S 2005-12-08 21:01:23 UTC (rev 12765)
@@ -21,10 +21,13 @@
#include <bits/errno.h>
#include <sys/syscall.h>
+.global mmap
+.set mmap,__mmap
.text
-.global mmap
-.type mmap,%function
-mmap:
+.global __mmap
+.hidden __mmap
+.type __mmap,%function
+__mmap:
/* Save registers. */
movl %ebx, %edx
@@ -46,4 +49,4 @@
/* Successful; return the syscall's value. */
ret
-.size mmap,.-mmap
+.size __mmap,.-__mmap
Modified: trunk/uClibc/libc/sysdeps/linux/mips/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/mips/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -14,5 +14,7 @@
#endif
#endif
-_syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
+#define __NR___mmap __NR_mmap
+attribute_hidden _syscall6 (__ptr_t, __mmap, __ptr_t, addr, size_t, len, int, prot,
int, flags, int, fd, __off_t, offset);
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -10,7 +10,7 @@
return (__sc_err & 0x10000000 ? errno = __sc_ret, __sc_ret = -1 : 0), \
(type) __sc_ret
-void * mmap(void *start, size_t length, int prot, int flags, int fd,
+void attribute_hidden * __mmap(void *start, size_t length, int prot, int flags, int fd,
off_t offset)
{
unsigned long __sc_ret, __sc_err;
@@ -45,4 +45,4 @@
__syscall_return (void *);
}
-
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/sysdeps/linux/sh/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sh/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/sh/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -31,4 +31,6 @@
#include <sys/syscall.h>
-_syscall6(__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset);
+#define __NR___mmap __NR_mmap
+attribute_hidden _syscall6(__ptr_t, __mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset);
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/sysdeps/linux/x86_64/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/x86_64/mmap.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/sysdeps/linux/x86_64/mmap.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -13,5 +13,7 @@
#include <sys/mman.h>
#include <sys/syscall.h>
-_syscall6(void *, mmap, void *, start, size_t, length, int, prot,
+#define __NR___mmap __NR_mmap
+attribute_hidden _syscall6(void *, __mmap, void *, start, size_t, length, int, prot,
int, flags, int, fd, off_t, offset);
+strong_alias(__mmap,mmap)
Modified: trunk/uClibc/libc/unistd/exec.c
===================================================================
--- trunk/uClibc/libc/unistd/exec.c 2005-12-08 20:59:58 UTC (rev 12764)
+++ trunk/uClibc/libc/unistd/exec.c 2005-12-08 21:01:23 UTC (rev 12765)
@@ -30,6 +30,7 @@
* to free the storage allocated for the copy. Better ideas anyone?
*/
+#define mmap __mmap
#define munmap __munmap
#define execve __execve
More information about the uClibc-cvs
mailing list