From ec3eb8fd19347eda580a2be599be36e454987ac2 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 5 Apr 2013 12:36:19 +0000 Subject: buildroot: factor knowledge of a 64bits architecture Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36204 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- rules.mk | 2 +- target/Config.in | 7 +++++++ toolchain/gcc/final/Makefile | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rules.mk b/rules.mk index 56129917e..d9d38374f 100644 --- a/rules.mk +++ b/rules.mk @@ -132,7 +132,7 @@ endif LIBRPC=-lrpc LIBRPC_DEPENDS=+librpc -ifneq ($(findstring $(ARCH) , mips64 x86_64 ),) +ifeq ($(CONFIG_ARCH_64BIT),y) LIB_SUFFIX:=64 endif diff --git a/target/Config.in b/target/Config.in index 79a91b1af..8ff89ff8a 100644 --- a/target/Config.in +++ b/target/Config.in @@ -70,6 +70,9 @@ config HAS_MIPS16 depends (mips || mipsel || mips64 || mips64el) bool +config ARCH_64BIT + bool + # Architecture selection config arm @@ -104,9 +107,11 @@ config mipsel config mips64 select BIG_ENDIAN + select ARCH_64BIT bool config mips64el + select ARCH_64BIT bool config powerpc @@ -115,6 +120,7 @@ config powerpc config powerpc64 select BIG_ENDIAN + select ARCH_64BIT bool config sh3 @@ -136,6 +142,7 @@ config sparc bool config x86_64 + select ARCH_64BIT bool config ARCH diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile index a667266a0..e8c32f629 100644 --- a/toolchain/gcc/final/Makefile +++ b/toolchain/gcc/final/Makefile @@ -35,7 +35,7 @@ define CleanupToolchain ln -sf ../include $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include rm -rf $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib ln -sf ../lib $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib - $(if $(CONFIG_mips64)$(CONFIG_mips64el)$(CONFIG_x86_64),ln -sf ../lib64 $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib64) + $(if $(CONFIG_ARCH_64BIT),ln -sf ../lib64 $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib64) endef define Host/Configure -- cgit v1.2.3