This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 057b857cbeb0aa6e3cb1e6db4cd80ebbf9bfe274 (commit) via 082ae9d1289fe20f8e96c30cfe05650c3e72eb02 (commit) from 70c47188ecf16d626893b6f06c5843830c98fa35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 057b857cbeb0aa6e3cb1e6db4cd80ebbf9bfe274 Author: Waldemar Brodkorb <wbx@uclibc-ng.org> Date: Mon Nov 23 19:07:31 2015 +0100 xtensa: remove ldso workaround by real pointer check An abort() is only generated when gcc does not implement a trap handler for the target architecture. This fixes the abort() generation. Latest gcc git master also contains a trap handler for xtensa. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Walemar Brodkorb <wbx@uclibc-ng.org> commit 082ae9d1289fe20f8e96c30cfe05650c3e72eb02 Author: Waldemar Brodkorb <wbx@openadk.org> Date: Fri Nov 13 18:56:50 2015 +0100 mips: remove ISA choice We don't add cpu specific CFLAGS to the build, so the ISA config symbols for MIPS are noops. Simple remove them. Reported-By: Bryan Hundven <bryanhundven@gmail.com> ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.mips | 45 -------------------------------------------- ldso/include/tlsdeschtab.h | 2 ++ ldso/ldso/Makefile.in | 5 ----- test/math/Makefile.in | 2 +- 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index 4d30d31..e0b62dd 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -31,48 +31,3 @@ config CONFIG_MIPS_N64_ABI bool "N64 ABI" endchoice - -choice - prompt "Target Processor Architecture" - default CONFIG_MIPS_ISA_1 if CONFIG_MIPS_O32_ABI - default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N32_ABI - default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N64_ABI - help - This selects the instruction set architecture of your MIPS CPU. This - information is used for optimizing purposes. To build a library that - will run on any MIPS CPU, you can specify "Generic (MIPS I)" here. - If you pick anything other than "Generic (MIPS I)," there is no - guarantee that uClibc will even run on anything other than the - selected processor type. - - You should probably select the MIPS ISA that best matches the - CPU you will be using on your device. uClibc will be tuned - for that architecture. - - If you don't know what to do, choose "Generic (MIPS I)" - -config CONFIG_MIPS_ISA_1 - bool "Generic (MIPS I)" - -config CONFIG_MIPS_ISA_2 - bool "MIPS II" - -config CONFIG_MIPS_ISA_3 - bool "MIPS III" - -config CONFIG_MIPS_ISA_4 - bool "MIPS IV" - -config CONFIG_MIPS_ISA_MIPS32 - bool "MIPS32" - -config CONFIG_MIPS_ISA_MIPS32R2 - bool "MIPS32r2" - -config CONFIG_MIPS_ISA_MIPS64 - bool "MIPS64" - -config CONFIG_MIPS_ISA_MIPS64R2 - bool "MIPS64r2" - -endchoice diff --git a/ldso/include/tlsdeschtab.h b/ldso/include/tlsdeschtab.h index 86baea1..056f859 100644 --- a/ldso/include/tlsdeschtab.h +++ b/ldso/include/tlsdeschtab.h @@ -98,6 +98,8 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) test.tlsinfo.ti_module = map->l_tls_modid; test.tlsinfo.ti_offset = ti_offset; entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc); + if (entry == NULL) + _dl_exit(1); if (*entry) { td = *entry; diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index ffbb5cc..75c2a06 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -27,11 +27,6 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" -# avoid ld.so linking error since gcc 4.9.x: undefined reference to abort -ifeq ($(TARGET_ARCH),xtensa) -CFLAGS-ldso.c += -fno-delete-null-pointer-checks -endif - LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-$(UCLIBC_LDSO_NAME).so := -Wl,--dsbt-index=1 ifneq ($(SUPPORT_LD_DEBUG),y) LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS) diff --git a/test/math/Makefile.in b/test/math/Makefile.in index 147d579..9fbd58a 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -35,7 +35,7 @@ $(MDEPS): libm-test.c ULP_SUFFIX := ifeq ($(TARGET_ARCH),mips) -ULP_SUFFIX:=$(if $(CONFIG_MIPS_ISA_MIPS64R1)$(CONFIG_MIPS_ISA_MIPS64R2),64,32) +ULP_SUFFIX:=$(if $(CONFIG_MIPS_N64_ABI),64,32) endif TARGET_ULP := $(if $(wildcard libm-test-ulps-$(TARGET_ARCH)$(ULP_SUFFIX)),$(TARGET_ARCH)$(ULP_SUFFIX),generic) hooks/post-receive -- uClibc-ng - small C library for embedded systems