diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/arm-arch.mk | 15 | ||||
| -rw-r--r-- | mk/binutils.mk | 4 | ||||
| -rw-r--r-- | mk/eglibc.mk | 4 | ||||
| -rw-r--r-- | mk/gcc.mk | 6 |
4 files changed, 0 insertions, 29 deletions
diff --git a/mk/arm-arch.mk b/mk/arm-arch.mk index 1b9e118..1694e36 100644 --- a/mk/arm-arch.mk +++ b/mk/arm-arch.mk @@ -27,10 +27,6 @@ LINUX_ARCH := arm GNU_TARGET_ARCH := arm EMBTK_MCU_FLAG := $(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING))) -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),y) -GNU_TARGET := arm-linux -STRICT_GNU_TARGET := arm-unknown-linux-gnueabi -else ifeq ($(CONFIG_EMBTK_ARCH_ARM_BIG_ENDIAN),y) GNU_TARGET := armeb-linux STRICT_GNU_TARGET := armeb-unknown-linux-gnueabi @@ -38,32 +34,21 @@ else GNU_TARGET := armel-linux STRICT_GNU_TARGET := armel-unknown-linux-gnueabi endif -endif #GCC configure options -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),y) -GCC_WITH_CPU := -else GCC_WITH_CPU := --with-cpu=$(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING))) -endif #GCC extra configure options for arm ifeq ($(CONFIG_EMBTK_GCC_LANGUAGE_JAVA),y) GCC3_CONFIGURE_EXTRA_OPTIONS += --enable-sjlj-exceptions endif - -#Does multilib selected? -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),y) -EMBTK_TARGET_FLOAT_CFLAGS := -else #Hard or soft floating point? ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y) EMBTK_TARGET_FLOAT_CFLAGS := -mfloat-abi=soft else EMBTK_TARGET_FLOAT_CFLAGS := -mfloat-abi=hard endif -endif endif diff --git a/mk/binutils.mk b/mk/binutils.mk index eeb9a55..30c133d 100644 --- a/mk/binutils.mk +++ b/mk/binutils.mk @@ -27,11 +27,7 @@ BINUTILS_SITE := http://ftp.gnu.org/gnu/binutils BINUTILS_PACKAGE := binutils-$(BINUTILS_VERSION).tar.bz2 BINUTILS_BUILD_DIR := $(TOOLS_BUILD)/binutils -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),) BINUTILS_MULTILIB := --disable-multilib -else -BINUTILS_MULTILIB := --enable-multilib -endif binutils_install: $(BINUTILS_BUILD_DIR)/.built diff --git a/mk/eglibc.mk b/mk/eglibc.mk index c192ffd..acd2df7 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -31,16 +31,12 @@ EGLIBC_PACKAGE := eglibc-$(EGLIBC_VERSION).tar.bz2 EGLIBC_HEADERS_BUILD_DIR := $(TOOLS_BUILD)/eglibc-headers EGLIBC_BUILD_DIR := $(TOOLS_BUILD)/eglibc -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),y) -EGLIBC_FLOAT_TYPE := -else #Hard or soft floating point in eglibc? ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y) EGLIBC_FLOAT_TYPE := --with-fp=no else EGLIBC_FLOAT_TYPE := --with-fp=yes endif -endif #EGLIBC options include $(EMBTK_ROOT)/mk/eglibc-options-parse.mk @@ -33,11 +33,6 @@ GCC1_BUILD_DIR := $(TOOLS_BUILD)/gcc1 GCC2_BUILD_DIR := $(TOOLS_BUILD)/gcc2 GCC3_BUILD_DIR := $(TOOLS_BUILD)/gcc3 -#Multilib or not? -ifeq ($(CONFIG_EMBTK_TOOLCHAIN_MULTILIB),y) -GCC_MULTILIB := -GCC_WITH_FLOAT := -else GCC_MULTILIB := --disable-multilib #Hard or soft floating point for GCC? ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y) @@ -45,7 +40,6 @@ GCC_WITH_FLOAT := --with-float=soft else GCC_WITH_FLOAT := --with-float=hard endif -endif GCC_LANGUAGES =c ifeq ($(CONFIG_EMBTK_GCC_LANGUAGE_CPP),y) |