diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | ldso/ldso/mips/dl-sysdep.h | 2 | ||||
| -rw-r--r-- | libc/stdio/_scanf.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/nios2/bits/endian.h | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/arm/Makefile.arch | 1 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/arm/libc-tls.c | 37 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch | 4 |
8 files changed, 50 insertions, 6 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) 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) 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 { \ 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/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 <bits/endian.h> directly; include <endian.h> instead." 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 <sysdeps/generic/libc-tls.c> +#include <dl-tls.h> + +#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 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 |