Updated uClibc toolchain from upstream.

diff --git a/trunk/toolchain/uClibc/common.mk b/trunk/toolchain/uClibc/common.mk
index e507dc6fb060009c7a5e4a7f96f421233addd48e..53a844318b477b32ba30877c5f223a79469a5b55 100644 (file)
--- a/trunk/toolchain/uClibc/common.mk
+++ b/trunk/toolchain/uClibc/common.mk
@@ -26,7 +26,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/i.86/i386/' \
                -e 's/sparc.*/sparc/' \
                -e 's/arm.*/arm/g' \
-               -e 's/avr32.*/avr32/g' \
                -e 's/m68k.*/m68k/' \
                -e 's/ppc/powerpc/g' \
                -e 's/v850.*/v850/g' \
@@ -34,7 +33,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/sh[234].*/sh/' \
                -e 's/mips.*/mips/' \
                -e 's/mipsel.*/mips/' \
-               -e 's/cris.*/cris/' \
 )
 
 GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
@@ -80,6 +78,7 @@ define Host/Configure
                -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
                -e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
                -e 's,^.*UCLIBC_BUILD_ALL_LOCALE.*,UCLIBC_BUILD_ALL_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
+               -e 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=$(if $(or $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),$(CONFIG_PKG_CC_STACKPROTECTOR_STRONG)),y,n),g' \
                $(HOST_BUILD_DIR)/.config.new
        cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
                cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \

diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/avr32 b/trunk/toolchain/uClibc/config-0.9.33.2/avr32
deleted file mode 100644 (file)
index 729fbc9..0000000
--- a/trunk/toolchain/uClibc/config-0.9.33.2/avr32
+++ /dev/null
@@ -1,12 +0,0 @@
-ARCH_BIG_ENDIAN=y
-CONFIG_AVR32_AP7=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LINKRELAX=y
-LINUXTHREADS_OLD=y
-TARGET_ARCH="avr32"
-TARGET_avr32=y
-UCLIBC_HAS_FPU=y
-# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
-# UCLIBC_HAS_STRING_ARCH_OPT is not set
-# UCLIBC_HAS_THREADS_NATIVE is not set
-UNIX98PTY_ONLY=y

diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/common b/trunk/toolchain/uClibc/config-0.9.33.2/common
index c587b9a9fc56d5233801ad10108266e50ecb49cd..b948d4bbb94d01233d3cea72f1e45592140bccff 100644 (file)
--- a/trunk/toolchain/uClibc/config-0.9.33.2/common
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/common
@@ -36,7 +36,7 @@ LDSO_LDD_SUPPORT=y
 # LDSO_NO_CLEANUP is not set
 # LDSO_PRELINK_SUPPORT is not set
 # LDSO_PRELOAD_FILE_SUPPORT is not set
-# LDSO_PRELOAD_ENV_SUPPORT is not set
+LDSO_PRELOAD_ENV_SUPPORT=y
 LDSO_RUNPATH=y
 # LDSO_SEARCH_INTERP_PATH is not set
 # LDSO_STANDALONE_SUPPORT is not set
@@ -158,6 +158,7 @@ UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_SOFT_FLOAT=y
 # UCLIBC_HAS_SSP is not set
+# UCLIBC_HAS_SSP_COMPAT is not set
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
 # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set

diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/cris b/trunk/toolchain/uClibc/config-0.9.33.2/cris
deleted file mode 100644 (file)
index 4164484..0000000
--- a/trunk/toolchain/uClibc/config-0.9.33.2/cris
+++ /dev/null
@@ -1,8 +0,0 @@
-ARCH_LITTLE_ENDIAN=y
-CONFIG_CRIS=y
-# CONFIG_CRISV32 is not set
-LINUXTHREADS_OLD=y
-TARGET_ARCH="cris"
-TARGET_cris=y
-UCLIBC_HAS_FPU=y
-# UCLIBC_HAS_THREADS_NATIVE is not set

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
index 0bf89e89bb28e1da4eeff32311f4385702778bec..390e06ddb758228753515fb772c2b17df581897b 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
@@ -1,6 +1,6 @@
 --- a/libc/inet/resolv.c
 +++ b/libc/inet/resolv.c
-@@ -317,6 +317,7 @@
+@@ -317,6 +317,7 @@ Domain name in a message can be represen
  #include <sys/utsname.h>
  #include <sys/un.h>
  #include <sys/stat.h>
@@ -8,7 +8,7 @@
  #include <bits/uClibc_mutex.h>
  #include "internal/parse_config.h"
  
-@@ -1861,7 +1862,6 @@
+@@ -1861,7 +1862,6 @@ int getnameinfo(const struct sockaddr *s
                                        c = inet_ntop(AF_INET6,
                                                (const void *) &sin6p->sin6_addr,
                                                host, hostlen);
@@ -16,7 +16,7 @@
                                        /* Does scope id need to be supported? */
                                        uint32_t scopeid;
                                        scopeid = sin6p->sin6_scope_id;
-@@ -1898,7 +1898,6 @@
+@@ -1898,7 +1898,6 @@ int getnameinfo(const struct sockaddr *s
                                                        return EAI_SYSTEM;
                                                memcpy(host + real_hostlen, scopebuf, scopelen + 1);
                                        }

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
index 4c23141ea3eb41b1999176d80391d06580f9693e..6732d54d3e479b27a0820b23ccd4780ceddc8f67 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
@@ -1,6 +1,6 @@
 --- a/libc/inet/resolv.c
 +++ b/libc/inet/resolv.c
-@@ -3536,6 +3536,61 @@
+@@ -3536,6 +3536,61 @@ __res_vinit(res_state rp, int preinit)
        return 0;
  }
  
@@ -62,7 +62,7 @@
  static void
  __res_iclose(void)
  {
-@@ -3608,61 +3663,6 @@
+@@ -3608,61 +3663,6 @@ struct __res_state *__resp = &_res;
  # endif
  #endif /* !__UCLIBC_HAS_THREADS__ */
  

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
index e23b0839ad376dcaba03ec67be9863df017b0975..06278898f9b5d197962cfde0c1788a5f18279752 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
@@ -24,7 +24,7 @@
        return 0;
  }
  
-@@ -3582,11 +3582,11 @@ res_init(void)
+@@ -3582,11 +3581,11 @@ res_init(void)
        if (!_res.id)
                _res.id = res_randomid();
  
@@ -38,7 +38,7 @@
        return 0;
  }
  libc_hidden_def(res_init)
-@@ -3687,7 +3687,11 @@ struct __res_state *__resp = &_res;
+@@ -3687,7 +3686,11 @@ struct __res_state *__resp = &_res;
  int
  res_ninit(res_state statp)
  {
@@ -51,5 +51,3 @@
  }
  
  #endif /* L_res_init */
---
-cgit v0.9.1

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
index d40f28df38d9baf37f3dbfa4b7ab71a3b2d83675..ce8448ab49e5be33934653928e0dc4661f1ea8e2 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
@@ -8,5 +8,3 @@
        __res_vinit(&_res, 1);
        __res_sync = res_sync_func;
  
---
-cgit v0.9.1

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
deleted file mode 100644 (file)
index 5e5460a..0000000
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libc/sysdeps/linux/avr32/bits/atomic.h
-+++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
- 
- #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)   \
-       ({                                                              \
-+              __uint32_t __result;                                    \
-               __typeof__(*(mem)) __prev;                              \
-               __asm__ __volatile__(                                   \
-                       "/* __arch_compare_and_exchange_val_32_acq */\n" \

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
index b3db8cf5dae4b085dd4fd5cccf3d407a9fb3c0f7..e85d6d452287d6e86768ddabf354afcb573ebe75 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
@@ -1,6 +1,6 @@
 --- a/extra/locale/gen_wctype.c
 +++ b/extra/locale/gen_wctype.c
-@@ -227,11 +227,12 @@
+@@ -227,11 +227,12 @@ int main(int argc, char **argv)
                        ++verbose;
                        continue;
                }
@@ -15,7 +15,7 @@
                if (!(totitle = wctrans("totitle"))) {
                        verbose_msg("no totitle transformation.\n");
                }
-@@ -306,43 +307,43 @@
+@@ -306,43 +307,43 @@ int main(int argc, char **argv)
  #endif
  #if 0
                                if (c < 256) {
@@ -88,7 +88,7 @@
  
                                        mine = 0;
                                        if (mywalnum(d,c)) ++mine; mine <<= 1;
-@@ -358,15 +359,15 @@
+@@ -358,15 +359,15 @@ int main(int argc, char **argv)
                                        if (mywupper(d,c)) ++mine; mine <<= 1;
                                        if (mywxdigit(d,c)) ++mine;
  
@@ -107,7 +107,7 @@
  /*                                            } */
                                        }
  #endif
-@@ -553,7 +554,7 @@
+@@ -553,7 +554,7 @@ int main(int argc, char **argv)
                for (c = 0; c <= 0x10ffffUL; c++)
  #endif
                {
@@ -116,7 +116,7 @@
                        unsigned int mine;
                        unsigned int upper, lower;
  
-@@ -568,19 +569,19 @@
+@@ -568,19 +569,19 @@ int main(int argc, char **argv)
                        }
  #endif
  #endif
@@ -149,7 +149,7 @@
  
                        {
                                unsigned int u;
-@@ -630,8 +631,8 @@
+@@ -630,8 +631,8 @@ int main(int argc, char **argv)
                                if (mywupper(d,c)) ++mine; mine <<= 1;
                                if (mywxdigit(d,c)) ++mine;
  
@@ -160,7 +160,7 @@
                                        if (c < 0x30000UL) {
                                                verbose_msg("sc=%#x u=%#x n=%#x i0=%#x i1=%#x\n", sc, u, n, i0, i1);
                                        }
-@@ -655,17 +656,17 @@
+@@ -655,17 +656,17 @@ int main(int argc, char **argv)
                                }
  
                                if (towupper(c) != upper) {

diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
index f57b8af5aff886483e14f72ccf0a2e48398d96ac..05512907104cf5be28ceb365bfa94abce98f09b2 100644 (file)
--- a/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
@@ -16,11 +16,9 @@ enabled.
 Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 ---
-diff --git a/Makefile.in b/Makefile.in
-index 3d3ba3d..da865db 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -272,6 +272,7 @@ HEADERS_RM-$(UCLIBC_HAS_XATTR)               += sys/xattr.h
+@@ -272,6 +272,7 @@ HEADERS_RM-$(UCLIBC_HAS_XATTR)          
  HEADERS_RM-$(UCLIBC_HAS_XLOCALE)             += xlocale.h
  HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC)          += sys/eventfd.h sys/fsuid.h \
        bits/inotify.h \
@@ -28,9 +26,6 @@ index 3d3ba3d..da865db 100644
        sys/inotify.h \
        sys/kdaemon.h \
        sys/perm.h \
-diff --git a/libc/sysdeps/linux/alpha/bits/eventfd.h b/libc/sysdeps/linux/alpha/bits/eventfd.h
-new file mode 100644
-index 0000000..b5a7e41
 --- /dev/null
 +++ b/libc/sysdeps/linux/alpha/bits/eventfd.h
 @@ -0,0 +1,31 @@
@@ -65,9 +60,6 @@ index 0000000..b5a7e41
 +    EFD_NONBLOCK  = 000000004
 +#define EFD_NONBLOCK EFD_NONBLOCK
 +  };
-diff --git a/libc/sysdeps/linux/common/bits/eventfd.h b/libc/sysdeps/linux/common/bits/eventfd.h
-new file mode 100644
-index 0000000..ef49c61
 --- /dev/null
 +++ b/libc/sysdeps/linux/common/bits/eventfd.h
 @@ -0,0 +1,31 @@
@@ -102,8 +94,6 @@ index 0000000..ef49c61
 +    EFD_NONBLOCK = 00004000
 +#define EFD_NONBLOCK EFD_NONBLOCK
 +  };
-diff --git a/libc/sysdeps/linux/common/sys/eventfd.h b/libc/sysdeps/linux/common/sys/eventfd.h
-index c46c2a5..1bf785f 100644
 --- a/libc/sysdeps/linux/common/sys/eventfd.h
 +++ b/libc/sysdeps/linux/common/sys/eventfd.h
 @@ -1,4 +1,4 @@
@@ -153,9 +143,6 @@ index c46c2a5..1bf785f 100644
  __END_DECLS
  
  #endif /* sys/eventfd.h */
-diff --git a/libc/sysdeps/linux/hppa/bits/eventfd.h b/libc/sysdeps/linux/hppa/bits/eventfd.h
-new file mode 100644
-index 0000000..6182c07
 --- /dev/null
 +++ b/libc/sysdeps/linux/hppa/bits/eventfd.h
 @@ -0,0 +1,32 @@
@@ -191,9 +178,6 @@ index 0000000..6182c07
 +    EFD_NONBLOCK  = 00200004 /* HPUX has separate NDELAY & NONBLOCK */
 +#define EFD_NONBLOCK EFD_NONBLOCK
 +  };
-diff --git a/libc/sysdeps/linux/mips/bits/eventfd.h b/libc/sysdeps/linux/mips/bits/eventfd.h
-new file mode 100644
-index 0000000..17b2f46
 --- /dev/null
 +++ b/libc/sysdeps/linux/mips/bits/eventfd.h
 @@ -0,0 +1,31 @@
@@ -228,9 +212,6 @@ index 0000000..17b2f46
 +    EFD_NONBLOCK = 00000200
 +#define EFD_NONBLOCK EFD_NONBLOCK
 +  };
-diff --git a/libc/sysdeps/linux/sparc/bits/eventfd.h b/libc/sysdeps/linux/sparc/bits/eventfd.h
-new file mode 100644
-index 0000000..bed9f09
 --- /dev/null
 +++ b/libc/sysdeps/linux/sparc/bits/eventfd.h
 @@ -0,0 +1,31 @@
@@ -265,5 +246,3 @@ index 0000000..bed9f09
 +    EFD_NONBLOCK = 0x004000
 +#define EFD_NONBLOCK EFD_NONBLOCK
 +  };
---
-cgit v0.9.1