diff options
| -rw-r--r-- | mk/kernel-vars.mk | 2 | ||||
| -rw-r--r-- | package/u-boot/Makefile | 10 | ||||
| -rw-r--r-- | target/config/Config.in.binutils | 6 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile.inc | 7 | ||||
| -rw-r--r-- | toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch | 38 |
6 files changed, 60 insertions, 7 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 475353d6f..ccb090d9d 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -27,7 +27,7 @@ ifneq ($(OS_FOR_BUILD),Linux) KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}' KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/usr/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -I${LINUX_DIR}/scripts/dtc/libfdt -DKBUILD_NO_NLS' else -KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' +KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)' endif ifneq ($(ADK_TARGET_KERNEL_LOADADDR),) diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index bf97764b2..054904da0 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2024.07 +PKG_VERSION:= 2025.01 PKG_RELEASE:= 1 -PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f +PKG_HASH:= cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= gnutls-host openssl-host dtc-host swig-host python3-host python-setuptools-host @@ -91,6 +91,8 @@ CONFIG:= starfive_visionfive2_defconfig UBOOT:= u-boot.itb endif +MAKE_FLAGS+= HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" HOST_STYLE:= manual @@ -104,9 +106,9 @@ endif host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) sandbox_defconfig ) + $(HOST_MAKE_FLAGS) tools-only_defconfig ) (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) + $(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) ) u-boot-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index cf11a76c9..3e141d4d6 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,6 +8,7 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 +default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2 default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64 default ADK_TOOLCHAIN_BINUTILS_2_44 @@ -54,6 +55,11 @@ config ADK_TOOLCHAIN_BINUTILS_2_37 depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_KVX +config ADK_TOOLCHAIN_BINUTILS_2_26 + bool "2.26" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_KVX + config ADK_TOOLCHAIN_BINUTILS_ARC bool "arc-2023.09" depends on ADK_TARGET_ARCH_ARC diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index cdeeb90ed..d60b42a08 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -39,9 +39,9 @@ config ADK_HOST_BUILD_LIBTOOL bool default y -config ADK_HOST_BUILD_LIBRESSL +config ADK_HOST_BUILD_OPENSSL bool - default n + default y config ADK_HOST_BUILD_PKGCONF bool diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 9e9e9a4c4..1fcab41a2 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -58,6 +58,13 @@ PKG_HASH:= c44968b97cd86499efbc4b4ab7d98471f673e5414c554ef54afa930062dbbfcb PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_26),y) +PKG_VERSION:= 2.26 +PKG_RELEASE:= 1 +PKG_HASH:= 9615feddaeedc214d1a1ecd77b6697449c952eab69d79ab2125ea050e944bcc1 +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_KVX),y) PKG_VERSION:= 782547a4e2bdf1308728032853678ca69bb154ea PKG_GIT:= hash diff --git a/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch new file mode 100644 index 000000000..074317a24 --- /dev/null +++ b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch @@ -0,0 +1,38 @@ +From ed3056ebdb9795446157af03d3e08fbb93c1b01d Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Tue, 29 Mar 2016 10:24:16 +0100 +Subject: [PATCH] Relax assertion in BFIN linker to allow for discard GOT + relocs. + + PR 17334 + * elf32-bfin.c (elf32_bfinfdpic_finish_dynamic_sections): Relax + assertion on the size of the got section to allow it to be bigger + than the number of relocs. + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +--- + bfd/elf32-bfin.c | 8 +++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c +index 7cc8b6d851e..b2fcf38b470 100644 +--- a/bfd/elf32-bfin.c ++++ b/bfd/elf32-bfin.c +@@ -4457,7 +4457,13 @@ 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 ++ /* PR 17334: It appears that the GOT section can end up ++ being bigger than the number of relocs. Presumably ++ because some relocs have been deleted. A test case has ++ yet to be generated for verify this, but in the meantime ++ the test below has been changed from == to >= so that ++ applications can continue to be built. */ ++ >= (bfinfdpic_gotrel_section (info)->reloc_count + * sizeof (Elf32_External_Rel))); + + if (bfinfdpic_gotfixup_section (info)) +-- +2.39.5 + |