From 9df521f763d8dc96f06ee083caad57b8382424fb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 31 Mar 2015 22:44:22 +0200 Subject: buildsys: Do not build crt upon pregen No need to build crt when just generating headers Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'ldso') diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 56f4a4556..bdd1d5e32 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -76,6 +76,7 @@ LDFLAGS-$(UCLIBC_LDSO_NAME).so += -T $(ldso:.$(ABI_VERSION)=).lds endif $(ldso): $(ldso:.$(ABI_VERSION)=) +$(ldso:.$(ABI_VERSION)=): | $(top_builddir)lib $(ldso:.$(ABI_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a ifeq ($(LDSO_PRELINK_SUPPORT),y) $(call create-lds) -- cgit v1.2.3 From 50f076d01c77d8782c455349d702507255abdc9d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Mar 2015 11:15:45 -0500 Subject: Revert "gcc 4.9.x produces some calls to abort()" This reverts commit 69ba9dcaa13bb8bbdc8630265d73298c39945416. --- ldso/ldso/Makefile.in | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index bdd1d5e32..815264291 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -27,14 +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 -ifeq ($(TARGET_ARCH),sh) -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) -- cgit v1.2.3 From ccd00917a2cb69b80714f9b9d028288ddac23e69 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 29 Mar 2015 16:20:54 -0500 Subject: gcc 4.4 does not have __builtin_unreachable For avr32 we still use gcc 4.4 compiler, so exlude the usage of __builtin_unreachable here. --- ldso/include/dl-syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ldso') diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 4749d7abd..0acd2ba4a 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -51,7 +51,7 @@ extern int _dl_errno; static __always_inline attribute_noreturn __cold void _dl_exit(int status) { INLINE_SYSCALL(_dl_exit, 1, status); -#if defined __GNUC__ +#if defined __GNUC__ && !__GNUC_PREREQ (4, 4) __builtin_unreachable(); /* shut up warning: 'noreturn' function does return*/ #else while (1); -- cgit v1.2.3 From bbe05b64872728cd3d78ed0ef06ac963a40c4400 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 9 Apr 2015 13:45:42 -0500 Subject: still required for xtensa --- ldso/ldso/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ldso') diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 815264291..a0ae7b3cd 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -27,6 +27,11 @@ 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) -- cgit v1.2.3