From 7e51d96939bbeec9c2a3d396b01b3fc24a1a2b6d Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 2 Jul 2009 22:18:54 +0200 Subject: Toolchain: GCC: define some configure options in arch Makefile Signed-off-by: Abdoulaye Walsimou Gaye --- mk/gcc.mk | 40 +++++++++++++++++----------------------- mk/mips-arch.mk | 11 +++++++++-- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'mk') diff --git a/mk/gcc.mk b/mk/gcc.mk index 91d42ce..8914033 100644 --- a/mk/gcc.mk +++ b/mk/gcc.mk @@ -1,4 +1,4 @@ -######################################################################################### +################################################################################ # GAYE Abdoulaye Walsimou, # Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. # @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. -######################################################################################### +################################################################################ # # \file gcc.mk # \brief gcc.mk of Embtoolkit # \author GAYE Abdoulaye Walsimou, # \date May 2009 -######################################################################################### +################################################################################ GCC_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_GCC_VERSION_STRING))) GCC_SITE := ftp://ftp.lip6.fr/pub/gcc/releases/gcc-$(GCC_VERSION) @@ -29,13 +29,6 @@ GCC1_BUILD_DIR := $(TOOLS_BUILD)/gcc1 GCC2_BUILD_DIR := $(TOOLS_BUILD)/gcc2 GCC3_BUILD_DIR := $(TOOLS_BUILD)/gcc3 -#Hard or soft floating point -ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y) -GCC_FLOAT_TYPE := soft -else -GCC_FLOAT_TYPE := hard -endif - gcc1_install: $(GCC1_BUILD_DIR)/.built gcc2_install: $(GCC2_BUILD_DIR)/.built @@ -69,13 +62,14 @@ $(GCC1_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,gcc-$(GCC_VERSION)) 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) \ - $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) \ + --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ARCH) $(GCC_WITH_CPU) \ + $(GCC_WITH_FLOAT) $(GCC_MULTILIB) $(GCC_WITH_ABI) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --without-headers --with-newlib --disable-shared --disable-threads \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ - --enable-languages=c --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \ - $(GCC_MULTILIB) $(GCC_WITH_ABI) + --enable-languages=c \ + --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) @touch $@ #GCC second stage @@ -89,13 +83,13 @@ $(GCC2_BUILD_DIR)/.configured: @mkdir -p $(GCC2_BUILD_DIR) 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) \ - $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) \ + --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ARCH) $(GCC_WITH_CPU) \ + $(GCC_WITH_FLOAT) $(GCC_MULTILIB) $(GCC_WITH_ABI) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ - --enable-languages=c --with-gmp=$(GMP_HOST_DIR) \ - --with-mpfr=$(MPFR_HOST_DIR) \ - $(GCC_MULTILIB) $(GCC_WITH_ABI) + --enable-languages=c \ + --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) @touch $@ #GCC last stage @@ -116,12 +110,12 @@ $(GCC3_BUILD_DIR)/.configured: @mkdir -p $(GCC3_BUILD_DIR) 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) \ - $(GCC_WITH_ARCH) $(GCC_WITH_CPU) --with-float=$(GCC_FLOAT_TYPE) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) \ + --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ARCH) $(GCC_WITH_CPU) \ + $(GCC_WITH_FLOAT) $(GCC_MULTILIB) $(GCC_WITH_ABI) \ --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++ \ - --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \ - $(GCC_MULTILIB) $(GCC_WITH_ABI) + --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) @touch $@ diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk index 101a043..b51dde8 100644 --- a/mk/mips-arch.mk +++ b/mk/mips-arch.mk @@ -113,8 +113,6 @@ STRICT_GNU_TARGET := mipsisa64r2-unknown-linux-gnu GNU_TARGET_ARCH := mips64r2 endif -endif - #GCC configure options GCC_WITH_ARCH := --with-arch=$(GNU_TARGET_ARCH) export GCC_WITH_ARCH @@ -145,3 +143,12 @@ EMBTK_TARGET_ABI := -mabi=64 export GCC_WITH_ABI EMBTK_TARGET_ABI endif +#Hard or soft floating point +ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y) +GCC_WITH_FLOAT := --with-float=soft +else +GCC_WITH_FLOAT := --with-float=hard +endif + +endif + -- cgit v1.2.3