changeset 1037:3a141d15c503

Update to uClibc 0.9.31.
author Rob Landley <rob@landley.net>
date Mon, 12 Apr 2010 00:11:10 -0500
parents e021bba5e22e
children 2957c1dd95cb
files download.sh sources/baseconfig-uClibc sources/patches/uClibc-fix-arm-unwind-001.patch sources/patches/uClibc-fix-arm-unwind-002.patch sources/patches/uClibc-fixm68k.patch sources/patches/uClibc-install2.patch
diffstat 6 files changed, 26 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Mon Apr 12 00:04:11 2010 -0500
+++ b/download.sh	Mon Apr 12 00:11:10 2010 -0500
@@ -26,8 +26,8 @@
 UNSTABLE=http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc7.tar.bz2 \
 maybe_fork "download || dienow"
 
-URL=http://www.uclibc.org/downloads/uClibc-0.9.30.3.tar.bz2 \
-SHA1=6856b5c0ed4134a555c408d4b0bd9a098b7f1cca \
+URL=http://uclibc.org/downloads/uClibc-0.9.31.tar.bz2 \
+SHA1=f25f70534594dffdb6b9008799a1532271178338 \
 UNSTABLE=http://uclibc.org/downloads/uClibc-snapshot.tar.bz2 \
 maybe_fork "download || dienow"
 
--- a/sources/baseconfig-uClibc	Mon Apr 12 00:04:11 2010 -0500
+++ b/sources/baseconfig-uClibc	Mon Apr 12 00:11:10 2010 -0500
@@ -15,7 +15,6 @@
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
 UCLIBC_CTOR_DTOR=y
-UCLIBC_HAS_THREADS=y
 LINUXTHREADS_OLD=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
@@ -28,6 +27,7 @@
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
+UCLIBC_HAS_LIBUTIL=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y
@@ -40,7 +40,6 @@
 UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
 UCLIBC_NTP_LEGACY=y
 UCLIBC_SV4_DEPRECATED=y
-UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
@@ -57,6 +56,7 @@
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 UCLIBC_HAS_WCHAR=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_HAS_STDIO_GETC_MACRO=y
 UCLIBC_HAS_STDIO_PUTC_MACRO=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
@@ -73,4 +73,3 @@
 UCLIBC_HAS_GNU_GLOB=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOEXECSTACK=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
--- a/sources/patches/uClibc-fix-arm-unwind-001.patch	Mon Apr 12 00:04:11 2010 -0500
+++ b/sources/patches/uClibc-fix-arm-unwind-001.patch	Mon Apr 12 00:11:10 2010 -0500
@@ -7,5 +7,5 @@
 -	aeabi_memmove.c aeabi_memset.c find_exidx.c
 +	aeabi_memmove.c aeabi_memset.c find_exidx.c aeabi_unwind_cpp_pr1.c
  SSRC += syscall-eabi.S
+ ARCH_OBJ_FILTEROUT := syscall.c
  ifeq ($(UCLIBC_HAS_WCHAR),y)
- CSRC += aeabi_mb_cur_max.c
--- a/sources/patches/uClibc-fix-arm-unwind-002.patch	Mon Apr 12 00:04:11 2010 -0500
+++ b/sources/patches/uClibc-fix-arm-unwind-002.patch	Mon Apr 12 00:11:10 2010 -0500
@@ -1,22 +1,26 @@
---- a/libc/sysdeps/linux/arm/aeabi_unwind_cpp_pr1.c	2006-01-29 15:02:08.000000000 -0600
-+++ b/libc/sysdeps/linux/arm/aeabi_unwind_cpp_pr1.c	2009-04-06 03:13:32.000000000 -0500
-@@ -24,19 +24,16 @@
+--- uClibc/libc/sysdeps/linux/arm/aeabi_unwind_cpp_pr1.c	2010-04-02 10:34:27.000000000 -0500
++++ uClibc.bak/libc/sysdeps/linux/arm/aeabi_unwind_cpp_pr1.c	2010-04-05 12:33:50.000000000 -0500
+@@ -24,17 +24,17 @@
  
  #include <stdlib.h>
  
--attribute_hidden
- void
- __aeabi_unwind_cpp_pr0 (void)
+-attribute_hidden void __aeabi_unwind_cpp_pr0 (void);
+-attribute_hidden void __aeabi_unwind_cpp_pr0 (void)
++void __aeabi_unwind_cpp_pr0 (void);
++void __aeabi_unwind_cpp_pr0 (void)
  {
  }
  
--attribute_hidden
- void
- __aeabi_unwind_cpp_pr1 (void)
+-attribute_hidden void __aeabi_unwind_cpp_pr1 (void);
+-attribute_hidden void __aeabi_unwind_cpp_pr1 (void)
++void __aeabi_unwind_cpp_pr1 (void);
++void __aeabi_unwind_cpp_pr1 (void)
  {
  }
  
--attribute_hidden
- void
- __aeabi_unwind_cpp_pr2 (void)
+-attribute_hidden void __aeabi_unwind_cpp_pr2 (void);
+-attribute_hidden void __aeabi_unwind_cpp_pr2 (void)
++void __aeabi_unwind_cpp_pr2 (void);
++void __aeabi_unwind_cpp_pr2 (void)
  {
+ }
--- a/sources/patches/uClibc-fixm68k.patch	Mon Apr 12 00:04:11 2010 -0500
+++ b/sources/patches/uClibc-fixm68k.patch	Mon Apr 12 00:11:10 2010 -0500
@@ -1,14 +1,12 @@
---- uClibc/Rules.mak	2008-09-28 02:10:20.000000000 -0500
-+++ alt-uClibc/Rules.mak	2008-09-30 16:56:19.000000000 -0500
-@@ -144,7 +144,11 @@
- # Flags in OPTIMIZATION are used only for non-debug builds
+--- uClibc/Rules.mak	2010-04-02 10:34:27.000000000 -0500
++++ uClibc.bak/Rules.mak	2010-04-12 00:08:21.000000000 -0500
+@@ -173,7 +173,9 @@
+ 
  OPTIMIZATION:=
  # Use '-Os' optimization if available, else use -O2, allow Config to override
-+ifneq ($(TARGET_ARCH),alpha)
 +ifneq ($(TARGET_ARCH),m68k)
  OPTIMIZATION+=$(call check_gcc,-Os,-O2)
 +endif
-+endif
  # Use the gcc 3.4 -funit-at-a-time optimization when available
  OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,)
- 
+ # shrinks code by about 0.1%
--- a/sources/patches/uClibc-install2.patch	Mon Apr 12 00:04:11 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-Index: Makefile.in
-===================================================================
---- uClibc/Makefile.in	(revision 25418)
-+++ uClibc/Makefile.in	(working copy)
-@@ -402,6 +402,7 @@
- 		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
- 		$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
- 	done
-+ifeq ($(HARDWIRED_ABSPATH),y)
- 	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
- 		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
- 		$(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
-@@ -409,16 +410,23 @@
- 		    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
- 		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
- 	fi
-+else
-+	-$(INSTALL) -m 644 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/
-+endif
- ifeq ($(UCLIBC_HAS_THREADS),y)
- ifneq ($(LINUXTHREADS_OLD),y)
-+ifeq ($(HARDWIRED_ABSPATH),y)
- 	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
- 		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
- 		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
- 		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
- 			>> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
- 	fi
-+else
-+	-$(INSTALL) -m 644 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/
- endif
- endif
-+endif
- ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- 	$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
- 		$(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so
-Index: extra/Configs/Config.in
-===================================================================
---- uClibc/extra/Configs/Config.in	(revision 25418)
-+++ uClibc/extra/Configs/Config.in	(working copy)
-@@ -1812,6 +1812,26 @@
- 	  For a typical target system this should be set to "/usr", such that
- 	  'make install' will install /usr/include/<header files>.
- 
-+config HARDWIRED_ABSPATH
-+	string "Hardwire absolute paths into linker scripts"
-+	default y
-+	help
-+	  This prepends absolute paths to the libraries mentioned in linker
-+	  scripts such as libc.so.
-+
-+	  This is a build time optimization.  It has no impact on dynamic
-+	  linking at runtime, which doesn't use linker scripts.
-+
-+	  You must disable this to use uClibc with a relocatable toolchain,
-+	  such as the prebuilt binary cross compilers at
-+	  http://uclibc.org/downloads/binaries which may be installed at an
-+	  arbitrary location (such as in a user's home directory).
-+
-+	  The amount of time saved by this optimization is actually too small to
-+	  measure. The linker just had to search the library path to find the
-+	  linker script, so the dentries are cache hot if it has to search the
-+	  same path again.  But it's what glibc does, so we do it too.
-+
- endmenu
- 
-