Browse Source

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

Peter S. Mazinger 18 years ago
parent
commit
a0a0d23539

+ 1 - 1
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)

+ 4 - 4
libc/sysdeps/linux/common/__syscall_fcntl.c

@@ -12,14 +12,14 @@
 #include <fcntl.h>
 
 #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

+ 2 - 2
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