diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-05-04 18:58:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-05-04 18:59:21 +0200 |
| commit | 5fa28f6a9631d6be707e99f04511dc1675eec491 (patch) | |
| tree | 2120f815239d72e2bb56bed69059b29d7e0666e6 /toolchain | |
| parent | 6f7be8c93a8ae1df7ff984d1025c043d31146fc6 (diff) | |
xtensa: preliminary support for upcoming FDPIC support in uClibc-ng
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile.inc | 7 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 5 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 8 | ||||
| -rw-r--r-- | toolchain/linux-headers/Makefile | 5 |
5 files changed, 30 insertions, 0 deletions
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 diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 175af8aae..2b2f7e03c 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -286,8 +286,13 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_INITIAL)/.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) gcc +else + tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE)_$(ADK_TARGET_ABI).tar \ + --strip-components=1 -C $(WRKSRC) gcc +endif endif mkdir -p $(GCC_BUILD_DIR_INITIAL) # these symlinks are very important, do not remove diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index b6c24865a..2b6132cd5 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -97,6 +97,14 @@ PKG_SITES:= https://github.com/kalray/gcc.git PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif +ifeq ($(ADK_TOOLCHAIN_GCC_XTENSA),y) +PKG_VERSION:= xtensa-fdpic-abi-spec-1.1 +PKG_GIT:= tag +PKG_SITES:= https://github.com/jcmvbkbc/gcc-xtensa.git +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 29 +endif ifeq ($(ADK_TOOLCHAIN_GCC_GIT),y) PKG_VERSION:= git PKG_SITES:= https://github.com/gcc-mirror/gcc.git diff --git a/toolchain/linux-headers/Makefile b/toolchain/linux-headers/Makefile index 79fef22b9..6e9f913e9 100644 --- a/toolchain/linux-headers/Makefile +++ b/toolchain/linux-headers/Makefile @@ -21,8 +21,13 @@ ifeq ($(ADK_KERNEL_ROOT_NFS),y) endif endif 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) linux +else + tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE)_$(ADK_TARGET_ABI).tar \ + --strip-components=1 -C $(WRKSRC) linux +endif endif ifneq ($(ADK_DISABLE_KERNEL_PATCHES),y) $(TRACE) kernel-patch |