From a0a0d235399e6a1d0e2f9a4bec7d1980b0f4d5b8 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 15 Nov 2005 15:46:44 +0000 Subject: Undo hiding __libc_fcntl[64], CANCELABLE_SYSCALL is not grep friendly ;-(, have to find some other way to make it internal to libc and libpthread --- libc/misc/internals/__uClibc_main.c | 2 +- libc/sysdeps/linux/common/__syscall_fcntl.c | 8 ++++---- libc/sysdeps/linux/common/__syscall_fcntl64.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libc') diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index b8dbbb515..8685f5a94 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -76,7 +76,7 @@ const char *__progname = 0; # define O_NOFOLLOW 0 #endif -extern int __libc_fcntl(int fd, int cmd, ...) attribute_hidden; +extern int __libc_fcntl(int fd, int cmd, ...); extern int __libc_open(const char *file, int flags, ...); static void __check_one_fd(int fd, int mode) diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c index ad752bcd6..701877c06 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl.c @@ -12,14 +12,14 @@ #include #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 -extern int __libc_fcntl64(int fd, int cmd, ...) attribute_hidden; +extern int __libc_fcntl64(int fd, int cmd, ...); #endif #define __NR___syscall_fcntl __NR_fcntl static inline _syscall3(int, __syscall_fcntl, int, fd, int, cmd, long, arg); -int attribute_hidden __libc_fcntl(int fd, int cmd, ...) +int __libc_fcntl(int fd, int cmd, ...) { long arg; va_list list; @@ -39,7 +39,7 @@ int attribute_hidden __libc_fcntl(int fd, int cmd, ...) return (__syscall_fcntl(fd, cmd, arg)); } -strong_alias(__libc_fcntl, fcntl) +weak_alias(__libc_fcntl, fcntl) #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__ -strong_alias(__libc_fcntl, fcntl64) +weak_alias(__libc_fcntl, fcntl64) #endif diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index 64421b579..7f9164b52 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -14,7 +14,7 @@ #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 #define __NR___syscall_fcntl64 __NR_fcntl64 static inline _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); -int attribute_hidden __libc_fcntl64(int fd, int cmd, ...) +int __libc_fcntl64(int fd, int cmd, ...) { long arg; va_list list; @@ -26,5 +26,5 @@ int attribute_hidden __libc_fcntl64(int fd, int cmd, ...) return (__syscall_fcntl64(fd, cmd, arg)); } -strong_alias(__libc_fcntl64, fcntl64) +weak_alias(__libc_fcntl64, fcntl64) #endif -- cgit v1.2.3