svn commit: trunk/uClibc/libc/sysdeps/linux/common

[psm at uclibc.org]

Author: psm
Date: 2005-12-13 13:23:53 -0800 (Tue, 13 Dec 2005)
New Revision: 12875

Log:
Hidden lseek[64], disabled llseek and _llseek for now, not in any headers

Modified:
   trunk/uClibc/libc/sysdeps/linux/common/llseek.c
   trunk/uClibc/libc/sysdeps/linux/common/lseek.c


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/common/llseek.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/llseek.c	2005-12-13 21:20:44 UTC (rev 12874)
+++ trunk/uClibc/libc/sysdeps/linux/common/llseek.c	2005-12-13 21:23:53 UTC (rev 12875)
@@ -25,7 +25,7 @@
 #include <features.h>
 #undef __OPTIMIZE__
 /* We absolutely do _NOT_ want interfaces silently
- *  *  * renamed under us or very bad things will happen... */
+ * renamed under us or very bad things will happen... */
 #ifdef __USE_FILE_OFFSET64
 # undef __USE_FILE_OFFSET64
 #endif
@@ -43,20 +43,20 @@
 		off_t, offset_lo, loff_t *, result, int, whence);
 #endif
 
-loff_t __libc_lseek64(int fd, loff_t offset, int whence)
+loff_t attribute_hidden __lseek64(int fd, loff_t offset, int whence)
 {
 	loff_t result;
 	return(loff_t)(INLINE_SYSCALL (_llseek, 5, fd, (off_t) (offset >> 32), 
 				(off_t) (offset & 0xffffffff), &result, whence) ?: result);
 }
 #else
-extern __off_t __libc_lseek(int fildes, off_t offset, int whence);
-loff_t __libc_lseek64(int fd, loff_t offset, int whence)
+extern __off_t __lseek(int fildes, off_t offset, int whence) attribute_hidden;
+loff_t __lseek64(int fd, loff_t offset, int whence)
 {
-	return(loff_t)(__libc_lseek(fd, (off_t) (offset & 0xffffffff), whence));
+	return(loff_t)(__lseek(fd, (off_t) (offset & 0xffffffff), whence));
 }
 #endif
-weak_alias(__libc_lseek64, _llseek);
-weak_alias(__libc_lseek64, llseek);
-weak_alias(__libc_lseek64, lseek64);
-
+strong_alias(__lseek64,lseek64)
+//strong_alias(__lseek64,_llseek)
+//strong_alias(__lseek64,llseek)
+weak_alias(__lseek64,__libc_lseek64)

Modified: trunk/uClibc/libc/sysdeps/linux/common/lseek.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/lseek.c	2005-12-13 21:20:44 UTC (rev 12874)
+++ trunk/uClibc/libc/sysdeps/linux/common/lseek.c	2005-12-13 21:23:53 UTC (rev 12875)
@@ -10,6 +10,7 @@
 #include "syscalls.h"
 #include <unistd.h>
 
-#define __NR___libc_lseek __NR_lseek
-_syscall3(__off_t, __libc_lseek, int, fildes, __off_t, offset, int, whence);
-weak_alias(__libc_lseek, lseek);
+#define __NR___lseek __NR_lseek
+attribute_hidden _syscall3(__off_t, __lseek, int, fildes, __off_t, offset, int, whence);
+strong_alias(__lseek,lseek)
+weak_alias(__lseek,__libc_lseek)