svn commit: branches/uClibc-nptl/libc: misc/internals sysdeps/linux/common
sjhill at uclibc.org
sjhill at uclibc.org
Sun Nov 6 05:25:53 UTC 2005
Author: sjhill
Date: 2005-11-05 21:25:52 -0800 (Sat, 05 Nov 2005)
New Revision: 12170
Log:
Changes to sync with trunk.
Modified:
branches/uClibc-nptl/libc/Makefile
branches/uClibc-nptl/libc/misc/internals/Makefile
branches/uClibc-nptl/libc/sysdeps/linux/common/posix_fadvise.c
Changeset:
Modified: branches/uClibc-nptl/libc/Makefile
===================================================================
--- branches/uClibc-nptl/libc/Makefile 2005-11-06 05:22:05 UTC (rev 12169)
+++ branches/uClibc-nptl/libc/Makefile 2005-11-06 05:25:52 UTC (rev 12170)
@@ -82,7 +82,7 @@
$(INSTALL) -d $(TOPDIR)lib
$(RM) $(AR_LIB_NAME)
cp shared_$(LIB_NAME).a $(AR_LIB_NAME)
- $(AR) $(ARFLAGS) $(AR_LIB_NAME) misc/internals/static.o `cat nonshared_obj.*`
+ $(AR) $(ARFLAGS) $(AR_LIB_NAME) `cat nonshared_obj.*`
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
$(MAKE) -C $(TOPDIR)libpthread/nptl obj.pthread.ar
$(AR) $(ARFLAGS) $(AR_LIB_NAME) `cat obj.pthread.ar`
Modified: branches/uClibc-nptl/libc/misc/internals/Makefile
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/Makefile 2005-11-06 05:22:05 UTC (rev 12169)
+++ branches/uClibc-nptl/libc/misc/internals/Makefile 2005-11-06 05:25:52 UTC (rev 12170)
@@ -50,7 +50,7 @@
"(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> interp.c
echo "#endif" >> interp.c
-$(COBJS) interp.o static.o: %.o : %.c
+$(COBJS) interp.o: %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/posix_fadvise.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/posix_fadvise.c 2005-11-06 05:22:05 UTC (rev 12169)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/posix_fadvise.c 2005-11-06 05:25:52 UTC (rev 12170)
@@ -21,7 +21,8 @@
}
weak_alias(__libc_posix_fadvise, posix_fadvise);
-#if defined __UCLIBC_HAS_LFS__ && !defined __NR_fadvise64_64
+#if defined __UCLIBC_HAS_LFS__ && !defined __NR_fadvise64_64 && \
+ !defined __USE_LARGEFILE64
weak_alias(__libc_posix_fadvise, posix_fadvise64);
#endif
More information about the uClibc-cvs
mailing list