diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Makefile.in | 6 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 2 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 5 | ||||
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in.2 | 5 |
4 files changed, 1 insertions, 17 deletions
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in index d1af87747..371509f4e 100644 --- a/toolchain/Makefile.in +++ b/toolchain/Makefile.in @@ -4,12 +4,6 @@ else THREADS:=--enable-threads endif -ifeq ($(BR2_ENABLE_MULTILIB),y) -MULTILIB:=--enable-multilib -else -MULTILIB:=--disable-multilib -endif - BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR) BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 93dbbb007..e44707c57 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -74,7 +74,6 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched $(BR2_CONFIGURE_DEVEL_SYSROOT) \ $(BR2_CONFIGURE_STAGING_SYSROOT) \ $(DISABLE_NLS) \ - $(MULTILIB) \ --disable-werror \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(EXTRA_BINUTILS_CONFIG_OPTIONS) \ @@ -128,7 +127,6 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched --mandir=/usr/share/man \ --infodir=/usr/share/info \ $(DISABLE_NLS) \ - $(MULTILIB) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \ --disable-werror \ $(SOFT_FLOAT_CONFIG_OPTION) \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index d9269bd23..b87270f8f 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -167,7 +167,7 @@ ifeq ("$(strip $(ARCH))","armeb") endif endif ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y) -ifneq ($(BR2_SOFT_FLOAT)$(BR2_ENABLE_MULTILIB),) +ifneq ($(BR2_SOFT_FLOAT),) toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional endif endif @@ -206,7 +206,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(GCC_WITH_HOST_MPFR) \ $(DISABLE_NLS) \ $(THREADS) \ - $(MULTILIB) \ $(GCC_DECIMAL_FLOAT) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ @@ -286,7 +285,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_HOST_MPFR) \ $(DISABLE_NLS) \ $(THREADS) \ - $(MULTILIB) \ $(GCC_DECIMAL_FLOAT) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ @@ -419,7 +417,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_WITH_TARGET_MPFR) \ $(DISABLE_NLS) \ $(THREADS) \ - $(MULTILIB) \ $(GCC_DECIMAL_FLOAT) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index 512a60844..2a17796fa 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -5,11 +5,6 @@ source "toolchain/elf2flt/Config.in" source "toolchain/mklibs/Config.in" source "toolchain/sstrip/Config.in" -config BR2_ENABLE_MULTILIB - bool "Enable multilib support?" - help - Build libraries to support different ABIs. - config BR2_VFP_FLOAT bool "Use ARM Vector Floating Point unit" depends on !BR2_SOFT_FLOAT |