From f1fbc971e786acdb48e030c97344299f3ace9eb9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Jul 2016 23:22:04 +0200 Subject: fixes for sh/bfin Signed-off-by: Waldemar Brodkorb --- package/libgcc/Makefile | 3 ++- toolchain/binutils/patches/2.26.1/bfin.patch | 13 +++++++++++++ toolchain/binutils/patches/2.26/bfin.patch | 13 ------------- 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 toolchain/binutils/patches/2.26.1/bfin.patch delete mode 100644 toolchain/binutils/patches/2.26/bfin.patch diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 7af6f361c..b6f0a55dd 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -31,12 +31,13 @@ endif ifeq ($(ADK_TARGET_CPU_SH_SH4),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m4*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif -endif +else ifeq ($(ADK_TARGET_ARCH_AVR32),) ifeq ($(ADK_TARGET_BINFMT_FLAT),) ${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif endif endif +endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/toolchain/binutils/patches/2.26.1/bfin.patch b/toolchain/binutils/patches/2.26.1/bfin.patch new file mode 100644 index 000000000..1f287518a --- /dev/null +++ b/toolchain/binutils/patches/2.26.1/bfin.patch @@ -0,0 +1,13 @@ +diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c +index 7cc8b6d..12f0add 100644 +--- a/bfd/elf32-bfin.c ++++ b/bfd/elf32-bfin.c +@@ -4457,7 +4457,7 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd, + if (bfinfdpic_got_section (info)) + { + BFD_ASSERT (bfinfdpic_gotrel_section (info)->size +- == (bfinfdpic_gotrel_section (info)->reloc_count ++ >= (bfinfdpic_gotrel_section (info)->reloc_count + * sizeof (Elf32_External_Rel))); + + if (bfinfdpic_gotfixup_section (info)) diff --git a/toolchain/binutils/patches/2.26/bfin.patch b/toolchain/binutils/patches/2.26/bfin.patch deleted file mode 100644 index 1f287518a..000000000 --- a/toolchain/binutils/patches/2.26/bfin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c -index 7cc8b6d..12f0add 100644 ---- a/bfd/elf32-bfin.c -+++ b/bfd/elf32-bfin.c -@@ -4457,7 +4457,7 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd, - if (bfinfdpic_got_section (info)) - { - BFD_ASSERT (bfinfdpic_gotrel_section (info)->size -- == (bfinfdpic_gotrel_section (info)->reloc_count -+ >= (bfinfdpic_gotrel_section (info)->reloc_count - * sizeof (Elf32_External_Rel))); - - if (bfinfdpic_gotfixup_section (info)) -- cgit v1.2.3