From a7c33ecabcead542e54c0c3514a92f4155add5b6 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 20 Jan 2011 09:15:21 +0100 Subject: stdio: fix diagnostic message harmless copy'n paste error in #error Signed-off-by: Bernhard Reutner-Fischer --- libc/stdio/_scanf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c index 28cd21e30..1ad81cbe3 100644 --- a/libc/stdio/_scanf.c +++ b/libc/stdio/_scanf.c @@ -550,7 +550,7 @@ enum { #elif defined(LLONG_MAX) && (INTMAX_MAX == LLONG_MAX) #define IMS 8 #else -#error fix QUAL_CHARS ptrdiff_t entry 't'! +#error fix QUAL_CHARS intmax_t entry 'j'! #endif #define QUAL_CHARS { \ -- cgit v1.2.3 From 3158d66d7060639225153b4cc9e373046f200ef6 Mon Sep 17 00:00:00 2001 From: Filippo Arcidiacono Date: Tue, 25 Jan 2011 12:50:23 +0100 Subject: libc: fix linker script generation for libubacktrace.so Fix libc.so linker script generation to add libubacktrace AS_NEEDED entry using MULTILIB_DIR instead of hard-coded "lib". Signed-off-by: Filippo Arcidiacono Signed-off-by: Carmelo Amoroso --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index ab5ab7286..2cd226d96 100644 --- a/Makefile.in +++ b/Makefile.in @@ -333,8 +333,8 @@ else endif ifeq ($(UCLIBC_HAS_BACKTRACE),y) # Add the AS_NEEDED entry for libubacktrace.so - if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ - echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ + echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ fi endif ifeq ($(UCLIBC_HAS_THREADS),y) -- cgit v1.2.3 From 9657b26d293370032604891a361d944b8bf0b234 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Fri, 28 Jan 2011 18:18:54 +0100 Subject: mips: avoid segmentation fault when RLD_MAP is 0 Signed-off-by: Richard Braun Acked-by: Joakim Tjernlund Signed-off-by: Khem Raj --- ldso/ldso/mips/dl-sysdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h index c1aad6661..80c089aed 100644 --- a/ldso/ldso/mips/dl-sysdep.h +++ b/ldso/ldso/mips/dl-sysdep.h @@ -109,7 +109,7 @@ else if (dpnt->d_tag == DT_MIPS_SYMTABNO) \ dynamic[DT_MIPS_SYMTABNO_IDX] = dpnt->d_un.d_val; \ else if (dpnt->d_tag == DT_MIPS_PLTGOT) \ dynamic[DT_MIPS_PLTGOT_IDX] = dpnt->d_un.d_val; \ -else if (dpnt->d_tag == DT_MIPS_RLD_MAP) \ +else if ((dpnt->d_tag == DT_MIPS_RLD_MAP) && (dpnt->d_un.d_ptr)) \ *(ElfW(Addr) *)(dpnt->d_un.d_ptr) = (ElfW(Addr)) debug_addr; \ } while (0) -- cgit v1.2.3 From 094d82d3b3e8f8c8460a802b7a9548f3ae4fda46 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 29 Jan 2011 09:14:53 -0800 Subject: nptl/mips64: Fix build when using mips64 and ABIs other than o32 Signed-off-by: Khem Raj --- libc/sysdeps/linux/common/Makefile.in | 4 ++++ libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 8a4add813..cf4cf8708 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -44,6 +44,10 @@ ifeq ($(TARGET_ARCH),arm) CSRC := $(filter-out vfork.c, $(CSRC)) else ifeq ($(TARGET_ARCH),x86_64) CSRC := $(filter-out vfork.c, $(CSRC)) +else ifeq ($(TARGET_ARCH),mips) +ifeq ($(CONFIG_MIPS_O32_ABI),y) +CSRC := $(filter-out waitpid.c, $(CSRC)) +endif else CSRC := $(filter-out waitpid.c, $(CSRC)) endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index 84fe17e8e..fc26a8e13 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -10,7 +10,9 @@ libpthread_linux_arch_CSRC = pthread_once.c pt-__syscall_rt_sigaction.c libc_linux_arch_CSRC = fork.c libc_linux_arch_SSRC = clone.S vfork.S - +ifneq ($(CONFIG_MIPS_O32_ABI),y) +libc_linux_arch_SSRC-OMIT = waitpid.S +endif ASFLAGS += -DUSE___THREAD CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread -- cgit v1.2.3 From 44b8aaf488b7356a893f5ce8f4b43b86334463d9 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 1 Feb 2011 17:38:07 +0100 Subject: nios2: Name architecture correctly in endian.h header Nios II is not i386 :-) Signed-off-by: Tobias Klauser Signed-off-by: Carmelo Amoroso --- libc/sysdeps/linux/nios2/bits/endian.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/nios2/bits/endian.h b/libc/sysdeps/linux/nios2/bits/endian.h index 54bd9d14b..de60addbc 100644 --- a/libc/sysdeps/linux/nios2/bits/endian.h +++ b/libc/sysdeps/linux/nios2/bits/endian.h @@ -1,4 +1,4 @@ -/* i386 is little-endian. */ +/* Nios II is little-endian. */ #ifndef _ENDIAN_H # error "Never use directly; include instead." -- cgit v1.2.3 From 269f901e62106e2d36acf4c2b79a9a5ec6d684ff Mon Sep 17 00:00:00 2001 From: Nitin Garg Date: Tue, 1 Feb 2011 19:30:23 -0600 Subject: arm: fix the static link problem for ARM due to undefined __tls_get_addr Signed-off-by: Nitin Garg Signed-off-by: Carmelo Amoroso --- libpthread/nptl/sysdeps/arm/Makefile.arch | 1 + libpthread/nptl/sysdeps/arm/libc-tls.c | 37 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 libpthread/nptl/sysdeps/arm/libc-tls.c diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch index a8bc1aadf..284dba43c 100644 --- a/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/arm/Makefile.arch @@ -15,3 +15,4 @@ ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-aeabi_read_tp.S = -DNOT_IN_libc=1 +libc_arch_a_CSRC = libc-tls.c diff --git a/libpthread/nptl/sysdeps/arm/libc-tls.c b/libpthread/nptl/sysdeps/arm/libc-tls.c new file mode 100644 index 000000000..1f98cd985 --- /dev/null +++ b/libpthread/nptl/sysdeps/arm/libc-tls.c @@ -0,0 +1,37 @@ +/* Thread-local storage handling in the ELF dynamic linker. ARM version. + Copyright (C) 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +#if defined(USE_TLS) && USE_TLS + +/* On ARM, 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 -- cgit v1.2.3