From 5fa28f6a9631d6be707e99f04511dc1675eec491 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 4 May 2024 18:58:42 +0200
Subject: xtensa: preliminary support for upcoming FDPIC support in uClibc-ng

---
 toolchain/binutils/Makefile     | 5 +++++
 toolchain/binutils/Makefile.inc | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'toolchain/binutils')

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 63b1080fb..5e2431165 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -44,8 +44,13 @@ endif
 
 $(WRKBUILD)/.configured:
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
+ifeq ($(ADK_TARGET_ABI),)
 	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \
 		--strip-components=1 -C $(WRKSRC) binutils
+else
+	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE)_$(ADK_TARGET_ABI).tar \
+		--strip-components=1 -C $(WRKSRC) binutils
+endif
 endif
 	(cd $(WRKBUILD); PATH='$(HOST_PATH)' \
 		MAKEINFO=true \
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 758539cf0..15c945c2c 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -65,6 +65,13 @@ PKG_HASH:=		71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_XTENSA),y)
+PKG_VERSION:=		xtensa-fdpic-abi-spec-1.1
+PKG_GIT:=		tag
+PKG_RELEASE:=		1
+PKG_SITES:=		https://github.com/jcmvbkbc/binutils-gdb-xtensa.git
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
 PKG_VERSION:=		git
 PKG_RELEASE:=		1
-- 
cgit v1.2.3