diff options
| author | jk <jk@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-12 23:14:42 +0000 |
|---|---|---|
| committer | jk <jk@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-04-12 23:14:42 +0000 |
| commit | 7e4be8edea219e2e688c2557961b1603bb71a7c2 (patch) | |
| tree | adccbc87893b645052bf0627516313616a982ce5 /toolchain/gcc/Makefile | |
| parent | f3ad2585b310d3629e6990b372c08aa551f295d5 (diff) | |
[toolchain] provide a cleaner way to specify a biarch toolchain build
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10802 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc/Makefile')
| -rw-r--r-- | toolchain/gcc/Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index a1d1baa40..875c37582 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -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 |