From 13e87953c1ee2197b1db953c5fcf567f47356c3c Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 28 Jun 2009 23:39:16 +0200 Subject: Toolchain: GCC: --with-arch and --with-cpu depend on the cpu so define them in arch Makefile Signed-off-by: Abdoulaye Walsimou Gaye --- mk/gcc.mk | 6 +++--- mk/mips-arch.mk | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/gcc.mk b/mk/gcc.mk index e2b4c1d..91d42ce 100644 --- a/mk/gcc.mk +++ b/mk/gcc.mk @@ -70,7 +70,7 @@ $(GCC1_BUILD_DIR)/.configured: cd $(GCC1_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \ $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ - --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ + $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --without-headers --with-newlib --disable-shared --disable-threads \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ @@ -90,7 +90,7 @@ $(GCC2_BUILD_DIR)/.configured: cd $(GCC2_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \ $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ - --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ + $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ --enable-languages=c --with-gmp=$(GMP_HOST_DIR) \ @@ -117,7 +117,7 @@ $(GCC3_BUILD_DIR)/.configured: cd $(GCC3_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \ $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ - --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ + $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) --enable-__cxa_atexit \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ --enable-threads --enable-shared --enable-languages=c,c++ \ diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk index 292dfd7..f0b66a8 100644 --- a/mk/mips-arch.mk +++ b/mk/mips-arch.mk @@ -116,6 +116,8 @@ endif endif #GCC configure options +GCC_WITH_ARCH := --with-arch=$(GNU_TARGET_ARCH) +export GCC_WITH_ARCH ifeq ($(CONFIG_EMBTK_ARCH_MIPS_ABI_O32),y) GCC_WITH_ABI := --with-abi=32 -- cgit v1.2.3