From b5b72b1e8cc2267e69af149f48b755b97627e74e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Jan 2018 23:10:12 +0100 Subject: binutils/gcc: cosmetic changes --- toolchain/binutils/Makefile | 2 +- toolchain/binutils/Makefile.inc | 2 +- .../arc-2016.09-release/openadk_binutils_fix.patch | 97 ---------------------- toolchain/gcc/Makefile | 4 +- toolchain/gcc/Makefile.inc | 42 ++++------ 5 files changed, 21 insertions(+), 126 deletions(-) delete mode 100644 toolchain/binutils/patches/arc-2016.09-release/openadk_binutils_fix.patch (limited to 'toolchain') diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index a844388cc..67707c881 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -76,7 +76,7 @@ ifeq ($(ADK_TARGET_USE_GOLD),y) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) else -ifeq (ADK_TOOLCHAIN_BINUTILS_2_20_1),) +ifeq (ADK_TOOLCHAIN_BINUTILS_AVR32),) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) endif diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index de1215ec7..fe24110d9 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -30,7 +30,7 @@ PKG_HASH:= ab1c72aeed2d50403bdf67914e60d936279d065943d83d1c19c20462a7b82cda PKG_SITES:= http://distfiles.openadk.org/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_20_1),y) +ifeq ($(ADK_TOOLCHAIN_BINUTILS_AVR32),y) PKG_VERSION:= 2.20.1 PKG_RELEASE:= 1 PKG_HASH:= 71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64 diff --git a/toolchain/binutils/patches/arc-2016.09-release/openadk_binutils_fix.patch b/toolchain/binutils/patches/arc-2016.09-release/openadk_binutils_fix.patch deleted file mode 100644 index d54fb1667..000000000 --- a/toolchain/binutils/patches/arc-2016.09-release/openadk_binutils_fix.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index fba58cb..d99da93 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -70,13 +70,7 @@ name_for_global_symbol (struct elf_link_hash_entry *h) - struct dynamic_sections - { - bfd_boolean initialized; -- asection * sgot; -- asection * srelgot; -- asection * sgotplt; -- asection * srelgotplt; - asection * sdyn; -- asection * splt; -- asection * srelplt; - }; - - enum dyn_section_types -@@ -1578,13 +1572,7 @@ arc_create_dynamic_sections (bfd * abfd, struct bfd_link_info *info) - struct dynamic_sections ds = - { - .initialized = FALSE, -- .sgot = NULL, -- .srelgot = NULL, -- .sgotplt = NULL, -- .srelgotplt = NULL, - .sdyn = NULL, -- .splt = NULL, -- .srelplt = NULL - }; - - htab = elf_hash_table (info); -@@ -1592,7 +1580,7 @@ arc_create_dynamic_sections (bfd * abfd, struct bfd_link_info *info) - - /* Create dynamic sections for relocatable executables so that we - can copy relocations. */ -- if (! htab->dynamic_sections_created && bfd_link_pic (info)) -+ if (! htab->dynamic_sections_created) - { - if (! _bfd_elf_link_create_dynamic_sections (abfd, info)) - BFD_ASSERT (0); -@@ -1600,18 +1588,6 @@ arc_create_dynamic_sections (bfd * abfd, struct bfd_link_info *info) - - dynobj = (elf_hash_table (info))->dynobj; - -- if (dynobj) -- { -- ds.sgot = htab->sgot; -- ds.srelgot = htab->srelgot; -- -- ds.sgotplt = bfd_get_section_by_name (dynobj, ".got.plt"); -- ds.srelgotplt = ds.srelplt; -- -- ds.splt = bfd_get_section_by_name (dynobj, ".plt"); -- ds.srelplt = bfd_get_section_by_name (dynobj, ".rela.plt"); -- } -- - if (htab->dynamic_sections_created) - { - ds.sdyn = bfd_get_section_by_name (dynobj, ".dynamic"); -@@ -1634,10 +1610,20 @@ elf_arc_check_relocs (bfd * abfd, - const Elf_Internal_Rela * rel_end; - bfd * dynobj; - asection * sreloc = NULL; -+ struct elf_link_hash_table * htab = elf_hash_table (info); - - if (bfd_link_relocatable (info)) - return TRUE; - -+ if (htab->dynobj == NULL) -+ htab->dynobj = abfd; -+ -+ if (! htab->dynamic_sections_created) -+ { -+ if (! _bfd_elf_link_create_dynamic_sections (abfd, info)) -+ return FALSE; -+ } -+ - dynobj = (elf_hash_table (info))->dynobj; - symtab_hdr = &((elf_tdata (abfd))->symtab_hdr); - sym_hashes = elf_sym_hashes (abfd); -@@ -1659,15 +1645,6 @@ elf_arc_check_relocs (bfd * abfd, - } - howto = arc_elf_howto (r_type); - -- if (dynobj == NULL -- && (is_reloc_for_GOT (howto) == TRUE -- || is_reloc_for_TLS (howto) == TRUE)) -- { -- dynobj = elf_hash_table (info)->dynobj = abfd; -- if (! _bfd_elf_create_got_section (abfd, info)) -- return FALSE; -- } -- - /* Load symbol information. */ - r_symndx = ELF32_R_SYM (rel->r_info); - if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b69cad2bd..eb21fc4fd 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -297,7 +297,7 @@ endif touch $@ $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured -ifeq ($(ADK_TOOLCHAIN_GCC_OLD),y) +ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y) PATH='$(TARGET_PATH)' \ $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc else @@ -307,7 +307,7 @@ endif touch $@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled -ifeq ($(ADK_TOOLCHAIN_GCC_OLD),y) +ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y) PATH='$(TARGET_PATH)' \ $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc else diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 3f1e4fda8..8c694cb30 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -18,13 +18,13 @@ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz LIBSTDCXXVER:= 22 endif -ifeq ($(ADK_TOOLCHAIN_GCC_4_9),y) -PKG_VERSION:= 4.9.4 -PKG_HASH:= 1680f92781b92cbdb57d7e4f647c650678c594154cb0d707fd9a994424a9860d +ifeq ($(ADK_TOOLCHAIN_GCC_AVR32),y) +PKG_VERSION:= 4.4.7 +PKG_HASH:= 76ad7c433af1c798a1e116c4dfa8f5f794f0d32bff65f88c54dcd5e5d146fc32 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -LIBSTDCXXVER:= 20 +LIBSTDCXXVER:= 19 endif ifeq ($(ADK_TOOLCHAIN_GCC_CSKY),y) PKG_VERSION:= gcc-6-branch-csky @@ -33,13 +33,13 @@ PKG_SITES:= https://github.com/c-sky/gcc.git PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -ifeq ($(ADK_TOOLCHAIN_GCC_OR1K),y) -PKG_VERSION:= musl-5.4.0 -PKG_GIT:= branch -PKG_SITES:= https://github.com/openrisc/or1k-gcc.git +ifeq ($(ADK_TOOLCHAIN_GCC_METAG),y) +PKG_VERSION:= 4.2.4 +PKG_HASH:= 7cb75c5183bd18f415860084440377016dc78feeee2852227b831f2e4fcaa5d6 +PKG_SITES:= http://gcc.cybermirror.org/releases/gcc-${PKG_VERSION}/ PKG_RELEASE:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -LIBSTDCXXVER:= 21 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 19 endif ifeq ($(ADK_TOOLCHAIN_GCC_NDS32),y) PKG_VERSION:= 4.9.4-nds32 @@ -48,25 +48,17 @@ PKG_SITES:= http://distfiles.openadk.org/ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -ifeq ($(ADK_TOOLCHAIN_GCC_4_4),y) -PKG_VERSION:= 4.4.7 -PKG_HASH:= 76ad7c433af1c798a1e116c4dfa8f5f794f0d32bff65f88c54dcd5e5d146fc32 -PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} -PKG_RELEASE:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -LIBSTDCXXVER:= 19 -endif -ifeq ($(ADK_TOOLCHAIN_GCC_4_2),y) -PKG_VERSION:= 4.2.4 -PKG_HASH:= 7cb75c5183bd18f415860084440377016dc78feeee2852227b831f2e4fcaa5d6 -PKG_SITES:= http://gcc.cybermirror.org/releases/gcc-${PKG_VERSION}/ +ifeq ($(ADK_TOOLCHAIN_GCC_OR1K),y) +PKG_VERSION:= musl-5.4.0 +PKG_GIT:= branch +PKG_SITES:= https://github.com/openrisc/or1k-gcc.git PKG_RELEASE:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -LIBSTDCXXVER:= 19 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +LIBSTDCXXVER:= 21 endif ifeq ($(ADK_TOOLCHAIN_GCC_GIT),y) PKG_VERSION:= git PKG_SITES:= https://github.com/gcc-mirror/gcc.git PKG_RELEASE:= 1 -LIBSTDCXXVER:= 21 +LIBSTDCXXVER:= 23 endif -- cgit v1.2.3