svn commit: branches/uClibc-nptl/libc/sysdeps/linux: arm common i386 mips x86_64
sjhill at uclibc.org
sjhill at uclibc.org
Sat Dec 10 18:15:39 UTC 2005
Author: sjhill
Date: 2005-12-10 10:15:33 -0800 (Sat, 10 Dec 2005)
New Revision: 12819
Log:
Finish up changes for sigaction and NPTL.
Modified:
branches/uClibc-nptl/libc/sysdeps/linux/arm/sigaction.c
branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_ipc.c
branches/uClibc-nptl/libc/sysdeps/linux/common/alarm.c
branches/uClibc-nptl/libc/sysdeps/linux/common/chdir.c
branches/uClibc-nptl/libc/sysdeps/linux/common/clock_gettime.c
branches/uClibc-nptl/libc/sysdeps/linux/common/dl-osinfo.h
branches/uClibc-nptl/libc/sysdeps/linux/common/fstat.c
branches/uClibc-nptl/libc/sysdeps/linux/common/fstat64.c
branches/uClibc-nptl/libc/sysdeps/linux/common/fstatfs.c
branches/uClibc-nptl/libc/sysdeps/linux/common/getcwd.c
branches/uClibc-nptl/libc/sysdeps/linux/common/gettimeofday.c
branches/uClibc-nptl/libc/sysdeps/linux/common/ioctl.c
branches/uClibc-nptl/libc/sysdeps/linux/common/lstat.c
branches/uClibc-nptl/libc/sysdeps/linux/common/lstat64.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mkdir.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mkfifo.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mknod.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mmap.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mmap64.c
branches/uClibc-nptl/libc/sysdeps/linux/common/mremap.c
branches/uClibc-nptl/libc/sysdeps/linux/common/nanosleep.c
branches/uClibc-nptl/libc/sysdeps/linux/common/noophooks.c
branches/uClibc-nptl/libc/sysdeps/linux/common/pause.c
branches/uClibc-nptl/libc/sysdeps/linux/common/pipe.c
branches/uClibc-nptl/libc/sysdeps/linux/common/poll.c
branches/uClibc-nptl/libc/sysdeps/linux/common/rmdir.c
branches/uClibc-nptl/libc/sysdeps/linux/common/select.c
branches/uClibc-nptl/libc/sysdeps/linux/common/sigpending.c
branches/uClibc-nptl/libc/sysdeps/linux/common/sigsuspend.c
branches/uClibc-nptl/libc/sysdeps/linux/common/stat.c
branches/uClibc-nptl/libc/sysdeps/linux/common/stat64.c
branches/uClibc-nptl/libc/sysdeps/linux/common/statfs.c
branches/uClibc-nptl/libc/sysdeps/linux/common/time.c
branches/uClibc-nptl/libc/sysdeps/linux/common/unlink.c
branches/uClibc-nptl/libc/sysdeps/linux/common/utime.c
branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.c
branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.h
branches/uClibc-nptl/libc/sysdeps/linux/i386/sigaction.c
branches/uClibc-nptl/libc/sysdeps/linux/mips/sigaction.c
branches/uClibc-nptl/libc/sysdeps/linux/x86_64/sigaction.c
Changeset:
Modified: branches/uClibc-nptl/libc/sysdeps/linux/arm/sigaction.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/arm/sigaction.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/arm/sigaction.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -127,6 +127,8 @@
}
#endif
+
+#ifndef LIBC_SIGACTION
hidden_weak_alias(__libc_sigaction,__sigaction)
weak_alias(__libc_sigaction,sigaction)
-
+#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_ipc.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_ipc.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_ipc.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -11,6 +11,6 @@
#ifdef __NR_ipc
#define __NR___syscall_ipc __NR_ipc
-_syscall5(int, __syscall_ipc, unsigned int, call, int, first, int, second, int,
+attribute_hidden _syscall5(int, __syscall_ipc, unsigned int, call, int, first, int, second, int,
third, void *, ptr);
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/alarm.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/alarm.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/alarm.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -12,10 +12,11 @@
#include "syscalls.h"
#include <unistd.h>
#ifdef __NR_alarm
-_syscall1(unsigned int, alarm, unsigned int, seconds);
+#define __NR___alarm __NR_alarm
+attribute_hidden _syscall1(unsigned int, __alarm, unsigned int, seconds);
#else
#include <sys/time.h>
-unsigned int alarm(unsigned int seconds)
+unsigned int attribute_hidden __alarm(unsigned int seconds)
{
struct itimerval old, new;
unsigned int retval;
@@ -34,3 +35,4 @@
return retval;
}
#endif
+strong_alias(__alarm,alarm)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/chdir.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/chdir.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/chdir.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -13,8 +13,8 @@
#define __NR___syscall_chdir __NR_chdir
static inline _syscall1(int, __syscall_chdir, const char *, path);
-int chdir(const char *path)
+int attribute_hidden __chdir(const char *path)
{
return __syscall_chdir(path);
}
-
+strong_alias(__chdir,chdir)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/clock_gettime.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/clock_gettime.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/clock_gettime.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -20,6 +20,8 @@
*
*/
+#define gettimeofday __gettimeofday
+
#define _GNU_SOURCE
#include "syscalls.h"
#include <time.h>
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/dl-osinfo.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/dl-osinfo.h 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/dl-osinfo.h 2005-12-10 18:15:33 UTC (rev 12819)
@@ -7,6 +7,8 @@
#ifndef _DL_OSINFO_H
#define _DL_OSINFO_H 1
+#define gettimeofday __gettimeofday
+
#include <features.h>
#ifdef __UCLIBC_HAS_SSP__
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/fstat.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/fstat.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/fstat.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -17,7 +17,7 @@
#define __NR___syscall_fstat __NR_fstat
static inline _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf);
-int fstat(int fd, struct stat *buf)
+int attribute_hidden __fstat(int fd, struct stat *buf)
{
int result;
struct kernel_stat kbuf;
@@ -28,7 +28,8 @@
}
return result;
}
+strong_alias(__fstat,fstat)
#if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
-weak_alias(fstat, fstat64);
+weak_alias(fstat,fstat64)
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/fstat64.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/fstat64.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/fstat64.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -19,7 +19,7 @@
static inline _syscall2(int, __syscall_fstat64,
int, filedes, struct kernel_stat64 *, buf);
-int fstat64(int fd, struct stat64 *buf)
+int attribute_hidden __fstat64(int fd, struct stat64 *buf)
{
int result;
struct kernel_stat64 kbuf;
@@ -30,4 +30,6 @@
}
return result;
}
+strong_alias(__fstat64,fstat64)
+
#endif /* __UCLIBC_HAS_LFS__ */
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/fstatfs.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/fstatfs.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/fstatfs.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -9,4 +9,6 @@
#include "syscalls.h"
#include <sys/vfs.h>
-_syscall2(int, fstatfs, int, fd, struct statfs *, buf);
+#define __NR___fstatfs __NR_fstatfs
+attribute_hidden _syscall2(int, __fstatfs, int, fd, struct statfs *, buf);
+strong_alias(__fstatfs,fstatfs)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/getcwd.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/getcwd.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/getcwd.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -1,5 +1,8 @@
/* These functions find the absolute path to the current working directory. */
+#define opendir __opendir
+#define closedir __closedir
+
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/gettimeofday.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/gettimeofday.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/gettimeofday.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -9,7 +9,6 @@
#include "syscalls.h"
#include <sys/time.h>
-#undef gettimeofday
#define __NR___gettimeofday __NR_gettimeofday
attribute_hidden _syscall2(int, __gettimeofday, struct timeval *, tv, struct timezone *, tz);
strong_alias(__gettimeofday,gettimeofday)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/ioctl.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/ioctl.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/ioctl.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -12,9 +12,10 @@
#include <sys/ioctl.h>
#define __NR___syscall_ioctl __NR_ioctl
+static inline
_syscall3(int, __syscall_ioctl, int, fd, unsigned long int, request, void *, arg);
-int ioctl(int fd, unsigned long int request, ...)
+int attribute_hidden __ioctl(int fd, unsigned long int request, ...)
{
void *arg;
va_list list;
@@ -25,4 +26,4 @@
va_end(list);
return __syscall_ioctl(fd, request, arg);
}
-
+strong_alias(__ioctl,ioctl)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/lstat.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/lstat.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/lstat.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -18,7 +18,7 @@
static inline _syscall2(int, __syscall_lstat,
const char *, file_name, struct kernel_stat *, buf);
-int lstat(const char *file_name, struct stat *buf)
+int attribute_hidden __lstat(const char *file_name, struct stat *buf)
{
int result;
struct kernel_stat kbuf;
@@ -29,7 +29,8 @@
}
return result;
}
+strong_alias(__lstat,lstat)
#if ! defined __NR_lstat64 && defined __UCLIBC_HAS_LFS__
-weak_alias(lstat, lstat64);
+weak_alias(lstat,lstat64)
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/lstat64.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/lstat64.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/lstat64.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -19,7 +19,7 @@
static inline _syscall2(int, __syscall_lstat64, const char *, file_name,
struct kernel_stat64 *, buf);
-int lstat64(const char *file_name, struct stat64 *buf)
+int attribute_hidden __lstat64(const char *file_name, struct stat64 *buf)
{
int result;
struct kernel_stat64 kbuf;
@@ -30,4 +30,6 @@
}
return result;
}
+strong_alias(__lstat64,lstat64)
+
#endif /* __UCLIBC_HAS_LFS__ */
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/mkdir.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mkdir.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mkdir.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -14,7 +14,8 @@
static inline _syscall2(int, __syscall_mkdir, const char *, pathname,
__kernel_mode_t, mode);
-int mkdir(const char *pathname, mode_t mode)
+int attribute_hidden __mkdir(const char *pathname, mode_t mode)
{
return (__syscall_mkdir(pathname, mode));
}
+strong_alias(__mkdir,mkdir)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/mkfifo.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mkfifo.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mkfifo.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -20,6 +20,8 @@
by Erik Andersen <andersee at debian.org>
*/
+#define mknod __mknod
+
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/mknod.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mknod.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mknod.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -15,7 +15,7 @@
static inline _syscall3(int, __syscall_mknod, const char *, path,
__kernel_mode_t, mode, __kernel_dev_t, dev);
-int mknod(const char *path, mode_t mode, dev_t dev)
+int attribute_hidden __mknod(const char *path, mode_t mode, dev_t dev)
{
/* We must convert the dev_t value to a __kernel_dev_t */
__kernel_dev_t k_dev;
@@ -23,3 +23,4 @@
k_dev = ((major(dev) & 0xff) << 8) | (minor(dev) & 0xff);
return __syscall_mknod(path, mode, k_dev);
}
+strong_alias(__mknod,mknod)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/mmap.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mmap.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mmap.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -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,
+attribute_hidden __ptr_t __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: branches/uClibc-nptl/libc/sysdeps/linux/common/mmap64.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mmap64.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mmap64.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -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: branches/uClibc-nptl/libc/sysdeps/linux/common/mremap.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/mremap.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/mremap.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -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: branches/uClibc-nptl/libc/sysdeps/linux/common/nanosleep.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/nanosleep.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/nanosleep.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -13,4 +13,5 @@
#define __NR___libc_nanosleep __NR_nanosleep
_syscall2(int, __libc_nanosleep, const struct timespec *, req,
struct timespec *, rem);
-weak_alias(__libc_nanosleep, nanosleep);
+hidden_weak_alias(__libc_nanosleep,__nanosleep)
+weak_alias(__libc_nanosleep,nanosleep)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/noophooks.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/noophooks.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/noophooks.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -18,9 +18,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <features.h>
+#include <libc-internal.h>
-void __cyg_profile_func_enter (void *this_fn, void *call_site)
+void
+__cyg_profile_func_enter (attribute_unused void *this_fn, attribute_unused void *call_site)
{
}
strong_alias (__cyg_profile_func_enter, __cyg_profile_func_exit)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/pause.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/pause.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/pause.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -7,22 +7,20 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define __sigpause __sigpause_internal
+#define sigblock __sigblock
+
#include "syscalls.h"
#include <unistd.h>
#ifdef __NR_pause
-
#define __NR___libc_pause __NR_pause
_syscall0(int, __libc_pause);
-weak_alias(__libc_pause, pause);
-
#else
-
#include <signal.h>
int __libc_pause(void)
{
return (__sigpause(sigblock(0), 0));
}
-weak_alias(__libc_pause, pause);
-
#endif
+weak_alias(__libc_pause, pause)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/pipe.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/pipe.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/pipe.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -9,4 +9,6 @@
#include "syscalls.h"
#include <unistd.h>
-_syscall1(int, pipe, int *, filedes);
+#define __NR___pipe __NR_pipe
+attribute_hidden _syscall1(int, __pipe, int *, filedes);
+strong_alias(__pipe,pipe)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/poll.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/poll.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/poll.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -18,13 +18,14 @@
02111-1307 USA. */
#define getdtablesize __getdtablesize
+#define select __select
#include "syscalls.h"
#include <sys/poll.h>
#ifdef __NR_poll
-
-_syscall3(int, poll, struct pollfd *, fds,
+#define __NR___poll __NR_poll
+attribute_hidden _syscall3(int, __poll, struct pollfd *, fds,
unsigned long int, nfds, int, timeout);
#else
@@ -44,7 +45,7 @@
Returns the number of file descriptors with events, zero if timed out,
or -1 for errors. */
-int poll(struct pollfd *fds, nfds_t nfds, int timeout)
+int attribute_hidden __poll(struct pollfd *fds, nfds_t nfds, int timeout)
{
static int max_fd_size;
struct timeval tv;
@@ -203,4 +204,4 @@
}
#endif
-
+strong_alias(__poll,poll)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/rmdir.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/rmdir.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/rmdir.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -9,4 +9,6 @@
#include "syscalls.h"
#include <unistd.h>
-_syscall1(int, rmdir, const char *, pathname);
+#define __NR___rmdir __NR_rmdir
+attribute_hidden _syscall1(int, __rmdir, const char *, pathname);
+strong_alias(__rmdir,rmdir)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/select.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/select.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/select.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -11,19 +11,10 @@
#include <unistd.h>
#ifdef __NR__newselect
-
-extern int _newselect(int n, fd_set * readfds, fd_set * writefds,
- fd_set * exceptfds, struct timeval *timeout);
-_syscall5(int, _newselect, int, n, fd_set *, readfds, fd_set *, writefds,
- fd_set *, exceptfds, struct timeval *, timeout);
-weak_alias(_newselect, select);
-
+#define __NR___select __NR__newselect
#else
-
-//Used as a fallback if _newselect isn't available...
-extern int select(int n, fd_set * readfds, fd_set * writefds,
- fd_set * exceptfds, struct timeval *timeout);
-_syscall5(int, select, int, n, fd_set *, readfds, fd_set *, writefds,
- fd_set *, exceptfds, struct timeval *, timeout);
-
+#define __NR___select __NR_select
#endif
+attribute_hidden _syscall5(int, __select, int, n, fd_set *, readfds, fd_set *, writefds,
+ fd_set *, exceptfds, struct timeval *, timeout);
+strong_alias(__select,select)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/sigpending.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/sigpending.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/sigpending.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -13,7 +13,7 @@
#ifdef __NR_rt_sigpending
#define __NR___rt_sigpending __NR_rt_sigpending
-_syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size);
+static inline _syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size);
int sigpending(sigset_t * set)
{
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/sigsuspend.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/sigsuspend.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/sigsuspend.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -13,22 +13,20 @@
#ifdef __NR_rt_sigsuspend
#define __NR___rt_sigsuspend __NR_rt_sigsuspend
-_syscall2(int, __rt_sigsuspend, const sigset_t *, mask, size_t, size);
+static inline _syscall2(int, __rt_sigsuspend, const sigset_t *, mask, size_t, size);
-int sigsuspend(const sigset_t * mask)
+int attribute_hidden __sigsuspend(const sigset_t * mask)
{
return __rt_sigsuspend(mask, _NSIG / 8);
}
-
#else
-
-#define __NR___sigsuspend __NR_sigsuspend
-_syscall3(int, __sigsuspend, int, a, unsigned long int, b,
+#define __NR___syscall_sigsuspend __NR_sigsuspend
+static inline _syscall3(int, __syscall_sigsuspend, int, a, unsigned long int, b,
unsigned long int, c);
-int sigsuspend(const sigset_t * set)
+int attribute_hidden __sigsuspend(const sigset_t * set)
{
- return __sigsuspend(0, 0, set->__val[0]);
+ return __syscall_sigsuspend(0, 0, set->__val[0]);
}
-
#endif
+strong_alias(__sigsuspend,sigsuspend)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/stat.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/stat.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/stat.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -17,7 +17,7 @@
static inline _syscall2(int, __syscall_stat,
const char *, file_name, struct kernel_stat *, buf);
-int stat(const char *file_name, struct stat *buf)
+int attribute_hidden __stat(const char *file_name, struct stat *buf)
{
int result;
struct kernel_stat kbuf;
@@ -28,7 +28,8 @@
}
return result;
}
+strong_alias(__stat,stat)
#if ! defined __NR_stat64 && defined __UCLIBC_HAS_LFS__
-weak_alias(stat, stat64);
+weak_alias(stat,stat64)
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/stat64.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/stat64.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/stat64.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -19,7 +19,7 @@
static inline _syscall2(int, __syscall_stat64,
const char *, file_name, struct kernel_stat64 *, buf);
-int stat64(const char *file_name, struct stat64 *buf)
+int attribute_hidden __stat64(const char *file_name, struct stat64 *buf)
{
int result;
struct kernel_stat64 kbuf;
@@ -30,4 +30,6 @@
}
return result;
}
+strong_alias(__stat64,stat64)
+
#endif /* __UCLIBC_HAS_LFS__ */
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/statfs.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/statfs.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/statfs.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -16,8 +16,8 @@
static inline _syscall2(int, __syscall_statfs,
const char *, path, struct statfs *, buf);
-int statfs(const char *path, struct statfs * buf)
+int attribute_hidden __statfs(const char *path, struct statfs * buf)
{
return __syscall_statfs(path, buf);
}
-
+strong_alias(__statfs,statfs)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/time.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/time.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/time.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -7,6 +7,8 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define gettimeofday __gettimeofday
+
#include "syscalls.h"
#include <time.h>
#include <sys/time.h>
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/unlink.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/unlink.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/unlink.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -9,4 +9,6 @@
#include "syscalls.h"
#include <unistd.h>
-_syscall1(int, unlink, const char *, pathname);
+#define __NR___unlink __NR_unlink
+attribute_hidden _syscall1(int, __unlink, const char *, pathname);
+strong_alias(__unlink,unlink)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/utime.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/utime.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/utime.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -8,6 +8,7 @@
*/
#define utimes __utimes
+#define gettimeofday __gettimeofday
#include "syscalls.h"
#include <utime.h>
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -32,7 +32,7 @@
#include <sys/stat.h>
#include "xstatconv.h"
-void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf)
+void attribute_hidden __xstat_conv(struct kernel_stat *kbuf, struct stat *buf)
{
/* Convert to current kernel version of `struct stat'. */
buf->st_dev = kbuf->st_dev;
@@ -57,7 +57,7 @@
#if defined(__UCLIBC_HAS_LFS__)
-void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf)
+void attribute_hidden __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf)
{
/* Convert to current kernel version of `struct stat64'. */
buf->st_dev = kbuf->st_dev;
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.h 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/xstatconv.h 2005-12-10 18:15:33 UTC (rev 12819)
@@ -25,8 +25,8 @@
* opinion on the subject, and different kernel revs use different names... */
#include <bits/kernel_stat.h>
-extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf);
+extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) attribute_hidden;
#if defined __UCLIBC_HAS_LFS__
-extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf);
+extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) attribute_hidden;
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/i386/sigaction.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/i386/sigaction.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/i386/sigaction.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -119,8 +119,11 @@
}
#endif
+
+#ifndef LIBC_SIGACTION
hidden_weak_alias(__libc_sigaction,__sigaction)
weak_alias(__libc_sigaction,sigaction)
+#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/sigaction.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/sigaction.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/sigaction.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -32,7 +32,7 @@
/* If ACT is not NULL, change the action for SIG to *ACT.
If OACT is not NULL, put the old action for SIG in *OACT. */
-int attribute_hidden __sigaction_internal (int sig, const struct sigaction *act, struct sigaction *oact)
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{
int result;
struct kernel_sigaction kact, koact;
@@ -72,7 +72,7 @@
/* If ACT is not NULL, change the action for SIG to *ACT.
If OACT is not NULL, put the old action for SIG in *OACT. */
-int attribute_hidden __sigaction_internal (int sig, const struct sigaction *act, struct sigaction *oact)
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{
int result;
struct old_kernel_sigaction kact, koact;
@@ -112,5 +112,6 @@
#endif
#ifndef LIBC_SIGACTION
-weak_alias(__sigaction_internal,sigaction)
+hidden_weak_alias(__libc_sigaction,__sigaction)
+weak_alias(__libc_sigaction,sigaction)
#endif
Modified: branches/uClibc-nptl/libc/sysdeps/linux/x86_64/sigaction.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/x86_64/sigaction.c 2005-12-10 18:03:53 UTC (rev 12818)
+++ branches/uClibc-nptl/libc/sysdeps/linux/x86_64/sigaction.c 2005-12-10 18:15:33 UTC (rev 12819)
@@ -119,8 +119,11 @@
return result;
}
#endif
+
+#ifndef LIBC_SIGACTION
hidden_weak_alias(__libc_sigaction,__sigaction)
weak_alias(__libc_sigaction,sigaction)
+#endif
/* NOTE: Please think twice before making any changes to the bits of
code below. GDB needs some intimate knowledge about it to
More information about the uClibc-cvs
mailing list