diff options
| -rw-r--r-- | Rules.mak | 11 | ||||
| -rw-r--r-- | ldso/ldso/bfin/dl-sysdep.h | 12 | 
2 files changed, 4 insertions, 19 deletions
@@ -292,12 +292,8 @@ CPU_CFLAGS-y := -funsigned-char -fno-builtin  $(eval $(call check-gcc-var,-fno-asm))  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),nios) +ifneq ($(TARGET_ARCH),bfin)  ifneq ($(TARGET_ARCH),nios2)  ifneq ($(TARGET_ARCH),sh)  ifneq ($(TARGET_ARCH),c6x) @@ -306,11 +302,6 @@ endif  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  $(eval $(call check-gcc-var,-std=gnu99)) diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h index c96526356..a026b641d 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  | 
