svn commit: trunk/uClibc/libc: misc/internals stdio stdlib sysdeps/linu etc...

psm at uclibc.org psm at uclibc.org
Fri Jan 27 21:26:41 UTC 2006


Author: psm
Date: 2006-01-27 13:26:40 -0800 (Fri, 27 Jan 2006)
New Revision: 13645

Log:
Do not build *64 and llseek, correct some failure when LFS is disabled

Modified:
   trunk/uClibc/libc/misc/internals/tempname.c
   trunk/uClibc/libc/stdio/fseeko.c
   trunk/uClibc/libc/stdio/ftello.c
   trunk/uClibc/libc/stdlib/Makefile.in
   trunk/uClibc/libc/sysdeps/linux/common/Makefile.in


Changeset:
Modified: trunk/uClibc/libc/misc/internals/tempname.c
===================================================================
--- trunk/uClibc/libc/misc/internals/tempname.c	2006-01-27 21:20:28 UTC (rev 13644)
+++ trunk/uClibc/libc/misc/internals/tempname.c	2006-01-27 21:26:40 UTC (rev 13645)
@@ -50,7 +50,9 @@
 libc_hidden_proto(sprintf)
 libc_hidden_proto(mkdir)
 libc_hidden_proto(open)
+#ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(open64)
+#endif
 libc_hidden_proto(read)
 libc_hidden_proto(close)
 libc_hidden_proto(getpid)

Modified: trunk/uClibc/libc/stdio/fseeko.c
===================================================================
--- trunk/uClibc/libc/stdio/fseeko.c	2006-01-27 21:20:28 UTC (rev 13644)
+++ trunk/uClibc/libc/stdio/fseeko.c	2006-01-27 21:26:40 UTC (rev 13645)
@@ -16,7 +16,9 @@
 # define OFFSET_TYPE   long int
 #endif
 
+#ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(fseeko64)
+#endif
 libc_hidden_proto(fseek)
 
 int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence)

Modified: trunk/uClibc/libc/stdio/ftello.c
===================================================================
--- trunk/uClibc/libc/stdio/ftello.c	2006-01-27 21:20:28 UTC (rev 13644)
+++ trunk/uClibc/libc/stdio/ftello.c	2006-01-27 21:26:40 UTC (rev 13645)
@@ -7,7 +7,9 @@
 
 #include "_stdio.h"
 
+#ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(ftello64)
+#endif
 libc_hidden_proto(ftell)
 
 #ifndef __DO_LARGEFILE

Modified: trunk/uClibc/libc/stdlib/Makefile.in
===================================================================
--- trunk/uClibc/libc/stdlib/Makefile.in	2006-01-27 21:20:28 UTC (rev 13644)
+++ trunk/uClibc/libc/stdlib/Makefile.in	2006-01-27 21:26:40 UTC (rev 13645)
@@ -57,12 +57,15 @@
 endif
 
 CSRC:= \
-	abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \
+	abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c \
 	rand.c random.c random_r.c setenv.c system.c div.c ldiv.c lldiv.c \
 	getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c drand48-iter.c jrand48.c \
 	jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \
 	nrand48_r.c rand_r.c srand48.c srand48_r.c seed48.c seed48_r.c \
 	valloc.c posix_memalign.c a64l.c l64a.c arc4random.c
+ifeq ($(UCLIBC_HAS_LFS),y)
+CSRC+=mkstemp64.c
+endif
 ifeq ($(UCLIBC_HAS_FLOATS),y)
 CSRC+=drand48.c drand48_r.c erand48.c erand48_r.c
 endif

Modified: trunk/uClibc/libc/sysdeps/linux/common/Makefile.in
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/Makefile.in	2006-01-27 21:20:28 UTC (rev 13644)
+++ trunk/uClibc/libc/sysdeps/linux/common/Makefile.in	2006-01-27 21:26:40 UTC (rev 13645)
@@ -14,6 +14,11 @@
 CSRC:=$(filter-out sbrk.c,$(CSRC))
 endif
 
+ifneq ($(UCLIBC_HAS_LFS),y)
+CSRC_LFS:=$(patsubst $(COMMON_DIR)/%.c,%.c,$(wildcard $(COMMON_DIR)/*64.c))
+CSRC:=$(filter-out llseek.c $(CSRC_LFS),$(CSRC))
+endif
+
 # full list
 #COMMON_NO_MULTI:=getcwd.c getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c getpriority64.c setpriority.c getrusage.c wait4.c getitimer.c setitimer.c open.c open64.c uname.c __syscall_fcntl.c __syscall_fcntl64.c
 COMMON_NO_MULTI:=getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c setpriority.c getrusage.c getitimer.c setitimer.c uname.c __syscall_rt_sigaction.c




More information about the uClibc-cvs mailing list