domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide a cleaner way to specify a biarch toolchain build

Browse Source 
Currently, to build a biarch toolchain, we need to explicitly give
options to the binutils and gcc configure commands:

CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS="--enable-targets=powerpc64-linux-uclibc"
CONFIG_EXTRA_GCC_CONFIG_OPTIONS="--enable-biarch --enable-targets=powerpc64-linux-uclibc"

This change replaces the command line options with an 'extra arch'
configure option:

CONFIG_EXTRA_TARGET_ARCH=y
CONFIG_EXTRA_TARGET_ARCH_NAME="powerpc64"

And a way to invoke this extra arch on the compiler command-line:

CONFIG_EXTRA_TARGET_ARCH_OPTS="-m64"

In this case, this results in an extra compiler:
 'powerpc64-linux-uclibc-gcc', which invokes
 'powerpc-linux-uclibc-gcc -m64'

This is a more standard way of building biarch toolchains, and allows
the packages to not have to care about how to invoke the 64-bit
compiler.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

SVN-Revision: 10802
This commit is contained in:
Jeremy Kerr
2008-04-12 23:14:42 +00:00
parent e2e1b51b41
commit 077d84f543
4 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
toolchain/gcc/Makefile
View File

@@ -40,6 +40,8 @@ BUILD_DIR2:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-final
SEP:=,
TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
define Stage1/Configure
$(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' $(TOOLCHAIN_DIR)/info.mk
$(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
@@ -60,6 +62,7 @@ define Stage1/Configure
--disable-nls \
--disable-libmudflap \
--disable-multilib \
$(EXTRA_TARGET) \
$(SOFT_FLOAT_CONFIG_OPTION) \
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
);
@@ -93,6 +96,7 @@ define Stage2/Configure
--disable-nls \
--disable-libmudflap \
--disable-multilib \
$(EXTRA_TARGET) \
$(SOFT_FLOAT_CONFIG_OPTION) \
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
);
@@ -102,6 +106,19 @@ define Stage2/Compile
export SHELL="\$(BASH)"; \$(MAKE) -C \$(BUILD_DIR2) all
endef
define SetupExtraArch
for app in $(TOOLCHAIN_DIR)/bin/$(OPTIMIZE_FOR_CPU)*-{gcc,gcc-*,g++}; do \
[ -e $$$$app ] || continue; \
old_base=$$$$(basename $$$$app); \
new_base=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-$$$${old_base##$(OPTIMIZE_FOR_CPU)-}; \
sed -e "s/@CC_BASE@/$$$$old_base/" \
-e 's/@EXTRA_ARCH_OPTS@/$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_OPTS))/' \
./files/alternate-arch-cc.in > \
$(TOOLCHAIN_DIR)/bin/$$$$new_base; \
chmod a+x $(TOOLCHAIN_DIR)/bin/$$$$new_base; \
done
endef
define Stage2/Install
$(MAKE) -C $(BUILD_DIR2) \
SHELL="$(BASH)" \
@@ -116,6 +133,7 @@ define Stage2/Install
$(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \
done; \
);
$(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch))
endef
define Build/Prepare

3
toolchain/gcc/files/alternate-arch-cc.in Normal file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
exec @CC_BASE@ @EXTRA_ARCH_OPTS@ "$@"