diff options
author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-12-06 15:37:37 +0100 |
---|---|---|
committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-12-06 15:37:37 +0100 |
commit | d181797c70183b897330a290e6f5f5d7e7812770 (patch) | |
tree | 09a3b2919e5b126ff95515a0bcb7916e22bcfb71 | |
parent | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (diff) | |
parent | e2903ddb06b1f50cb4ac9af0b035c74ed6b9d30f (diff) |
Merge commit 'origin/master' into prelink
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | extra/Configs/Config.sparc | 3 | ||||
-rw-r--r-- | include/stdlib.h | 2 | ||||
-rw-r--r-- | libc/stdlib/stdlib.c | 3 | ||||
-rw-r--r-- | libpthread/nptl/sysdeps/mips/libc-tls.c | 2 | ||||
-rw-r--r-- | libpthread/nptl/sysdeps/sh/Makefile.arch | 2 | ||||
-rw-r--r-- | libpthread/nptl/sysdeps/sh/libc-tls.c | 31 | ||||
-rw-r--r-- | test/.gitignore | 1 | ||||
-rw-r--r-- | test/stdlib/teststrtoq.c | 89 |
9 files changed, 129 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index b199293ae..3399f8842 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,10 +280,10 @@ HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h ### ucontext.h ifneq ($(findstring install,$(MAKECMDGOALS)),) -$(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): +$(addprefix $(PREFIX)$(DEVEL_PREFIX),include $(MULTILIB_DIR)): $(do_mkdir) # avoid warning about duplicate targets in rule or overrides -ifneq ($(abspath $(RUNTIME_PREFIX)$(MULTILIB_DIR)),$(abspath $(DEVEL_PREFIX)lib)) +ifneq ($(abspath $(RUNTIME_PREFIX)$(MULTILIB_DIR)),$(abspath $(DEVEL_PREFIX)$(MULTILIB_DIR))) $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR): $(do_mkdir) endif diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index dd8949039..1852efee9 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -19,9 +19,6 @@ choice This is the processor type of your CPU. This information is used for optimizing purposes. Building for a v8 SPARC is pretty safe nowadays. - Warning: shared library support requires v8 or better, so building for - SPARC v7 will give you only static support. - config CONFIG_SPARC_V7 bool "SPARC v7" diff --git a/include/stdlib.h b/include/stdlib.h index ce92ccd28..300edf04a 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -214,7 +214,7 @@ __END_NAMESPACE_STD /* Convert a string to a quadword integer. */ __extension__ -extern long long int strtoq (__const char *__restrict __nptr, +extern quad_t strtoq (__const char *__restrict __nptr, char **__restrict __endptr, int __base) __THROW __nonnull ((1)) __wur; /* Convert a string to an unsigned quadword integer. */ diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index ad0c4aac0..4d608eeac 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -342,6 +342,9 @@ extern __typeof(__XL_NPP(strtol)) __XL_NPP(strtoll); libc_hidden_proto(__XL_NPP(strtoll)) strong_alias(__XL_NPP(strtol),__XL_NPP(strtoll)) libc_hidden_def(__XL_NPP(strtoll)) +#if !defined(L_strtol_l) +strong_alias(strtol,strtoq) +#endif #endif #endif diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c index fdedc9f5a..157ba3389 100644 --- a/libpthread/nptl/sysdeps/mips/libc-tls.c +++ b/libpthread/nptl/sysdeps/mips/libc-tls.c @@ -17,7 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <../generic/libc-tls.c> +#include <sysdeps/generic/libc-tls.c> #include <dl-tls.h> #if USE_TLS diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch index 3cb58ec36..411622adc 100644 --- a/libpthread/nptl/sysdeps/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/sh/Makefile.arch @@ -10,4 +10,4 @@ ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE - +libc_arch_a_CSRC := libc-tls.c diff --git a/libpthread/nptl/sysdeps/sh/libc-tls.c b/libpthread/nptl/sysdeps/sh/libc-tls.c new file mode 100644 index 000000000..7b3389503 --- /dev/null +++ b/libpthread/nptl/sysdeps/sh/libc-tls.c @@ -0,0 +1,31 @@ +/* + * Thread-local storage handling in statically linked binaries. SH version. + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * Based on GNU C Library (file: libc/sysdeps/sh/libc-tls.c) + * + * Copyright (C) 2010 STMicroelectronics Ltd. + * Author: Filippo Arcidiacono <filippo.arcidiacono@st.com> + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + * + */ + +#include <sysdeps/generic/libc-tls.c> +#include <dl-tls.h> + +#if defined (USE_TLS) && (USE_TLS) + +/* On SH, linker optimizations are not required, so __tls_get_addr + can be called even in statically linked binaries. In this case module + must be always 1 and PT_TLS segment exist in the binary, otherwise it + would not link. */ + +void * +__tls_get_addr (tls_index *ti) +{ + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} + +#endif diff --git a/test/.gitignore b/test/.gitignore index 605d16d55..991ce5f85 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -256,6 +256,7 @@ stdlib/test-canon stdlib/test-canon2 stdlib/teston_exit stdlib/teststrtol +stdlib/teststrtoq string/bug-strcoll1 string/bug-strncat1 string/bug-strpbrk1 diff --git a/test/stdlib/teststrtoq.c b/test/stdlib/teststrtoq.c new file mode 100644 index 000000000..6e1a4cbc6 --- /dev/null +++ b/test/stdlib/teststrtoq.c @@ -0,0 +1,89 @@ + +#include <stdlib.h> +#include <stdio.h> + + +const char *strings[]={ + /* some simple stuff */ + "0", "1", "10", + "100", "1000", "10000", "100000", "1000000", + "10000000", "100000000", "1000000000", + + /* negative */ + "-0", "-1", "-10", + "-100", "-1000", "-10000", "-100000", "-1000000", + "-10000000", "-100000000", "-1000000000", + + /* test base>10 */ + "a", "b", "f", "g", "z", + + /* test hex */ + "0x0", "0x1", "0xa", "0xf", "0x10", + + /* test octal */ + "00", "01", "07", "08", "0a", "010", + + /* other */ + "0x8000000", + + /* check overflow cases: (for 32 bit) */ + "2147483645", + "2147483646", + "2147483647", + "2147483648", + "2147483649", + "-2147483645", + "-2147483646", + "-2147483647", + "-2147483648", + "-2147483649", + "4294967293", + "4294967294", + "4294967295", + "4294967296", + "4294967297", + "-4294967293", + "-4294967294", + "-4294967295", + "-4294967296", + "-4294967297", + + /* bad input tests */ + "", + "00", + "0x", + "0x0", + "-", + "+", + " ", + " -", + " - 0", +}; +int n_tests=sizeof(strings)/sizeof(strings[0]); + + + +void do_test(int base); +void do_test(int base) +{ + int i; + quad_t n; + char *endptr; + + for(i=0;i<n_tests;i++){ + n=strtoq(strings[i],&endptr,base); + printf("strtoq(\"%s\",%d) len=%lu res=%qd\n", + strings[i],base,(unsigned long)(endptr-strings[i]),n); + } +} + +int main(int argc,char *argv[]) +{ + do_test(0); + do_test(8); + do_test(10); + do_test(16); + do_test(36); + + return 0; +} |