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, master has been updated via 633d9a3da5f6a1fed7defd93022a93a2cfd28f9a (commit) from 9053b90bf3ab2f6f176c2e334db8010efd0d47ca (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 633d9a3da5f6a1fed7defd93022a93a2cfd28f9a Author: Waldemar Brodkorb wbx@openadk.org Date: Wed Mar 11 23:35:36 2015 -0500

resolve bfin with binfmt flat compile errors

gcc for bfin does not support -msoft-float. Do not enable FDPIC stuff, when compiling FLAT binaries.

-----------------------------------------------------------------------

Summary of changes: Rules.mak | 8 +------- ldso/ldso/bfin/dl-sysdep.h | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Rules.mak b/Rules.mak index 146ea72..d13604f 100644 --- a/Rules.mak +++ b/Rules.mak @@ -294,9 +294,7 @@ CPU_CFLAGS-y += $(CFLAG_-fno-asm)

LDADD_LIBFLOAT= ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y) -# If -msoft-float isn't supported, we want an error anyway. -# Hmm... might need to revisit this for arm since it has 2 different -# soft float encodings. +ifneq ($(TARGET_ARCH),bfin) ifneq ($(TARGET_ARCH),nios2) ifneq ($(TARGET_ARCH),sh) ifneq ($(TARGET_ARCH),c6x) @@ -304,10 +302,6 @@ CPU_CFLAGS-y += -msoft-float endif endif endif -ifeq ($(TARGET_ARCH),arm) -# No longer needed with current toolchains, but leave it here for now. -# If anyone is actually still using gcc 2.95 (say), they can uncomment it. -# LDADD_LIBFLOAT=-lfloat endif endif

diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h index c965263..a026b64 100644 --- a/ldso/ldso/bfin/dl-sysdep.h +++ b/ldso/ldso/bfin/dl-sysdep.h @@ -79,6 +79,7 @@ while (0) #define DL_MAP_SEGMENT(EPNT, PPNT, INFILE, FLAGS) \ __dl_map_segment (EPNT, PPNT, INFILE, FLAGS)

+#if defined(__FDPIC__) #include "../fdpic/dl-sysdep.h"

static __always_inline Elf32_Addr @@ -92,13 +93,6 @@ static __always_inline void elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { -#if 0 - Elf32_Rel * rpnt = (void *) rel_addr; - --rpnt; - do { - Elf32_Addr *const reloc_addr = (void *) (load_off + (++rpnt)->r_offset); - - *reloc_addr = DL_RELOC_ADDR (load_off, *reloc_addr); - } while (--relative_count); -#endif + return 0; } +#endif

hooks/post-receive