toolchain: remove multilib

Supporting multilib is much more than just passing --enable-multilib
to gcc. You have to actually build the C library several times (once
for each multilib variant you want to support in your toolchain), and
to pass MULTILIB_OPTIONS/MULTILIB_EXCEPTIONS values to gcc to let it
know the set of multilib variants you're interested in.

Since we'll probably never support multilib toolchains in Buildroot,
just get rid of this BR2_ENABLE_MULTILIB option.

Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 2ac7de3bec815a165d2bc7c3c50330d49be4292d..26a999abf05a0db97e131ef76e969f5854914685 100644 (file)
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -284,7 +284,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 # BR2_VFP_FLOAT is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 2a193cfaf8293f1b0e91b8da0cce42c75bc955c4..66a9984cbd5ef2b12860b9af334fc2f1027495fd 100644 (file)
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -299,7 +299,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 # BR2_VFP_FLOAT is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 98d3401c3df464f5b7144b23b6fdb152b6b5fc85..594b6e82d61b1be9228b9b8758c19a39af6b2b98 100644 (file)
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -305,7 +305,6 @@ BR2_GDB_VERSION="6.8"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y

diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index ec4005d1a49d9b54808fb65c70fe7e557f9a8a4d..76526c94c03fdc7c665283aa41207196884cf59c 100644 (file)
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -205,7 +205,6 @@ BR2_CCACHE=y
 #
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y

diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 7524c68680487b295d29da48431bad14a5b86a4c..9a2de946df04cd117eb5fddf85dfa7017162065e 100644 (file)
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -299,7 +299,6 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y

diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 85ccedee804dfd286b83a5754da659bf3a8ae7c6..99efe178ba88a0efb48137f4a546e7e9232ec74f 100644 (file)
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -304,7 +304,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 # BR2_VFP_FLOAT is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 57d72aeaf0dea8e5a35acd95407f0f6b73049c35..90b94f1167be9b0a27dbe82e99538289dba22586 100644 (file)
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -304,7 +304,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-# BR2_ENABLE_MULTILIB is not set
 # BR2_VFP_FLOAT is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 

diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 270c056ecf22bb29d596ee4a511f4c5a453a4104..5d27a2233035181cd5bf6ce905c35d678d17ca6b 100644 (file)
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -230,7 +230,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 # BR2_CROSS_TOOLCHAIN_TARGET_UTILS is not set
 
 #

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index a78372df2e8a92c3013cff0b147a487d628f7b6c..3d6c3f198ebe1dfa4b4654a2097b4e10f5f360d0 100644 (file)
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -225,7 +225,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #

diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 451e248e0df3ef73512b6dffdecb7139d687010e..aa5af8b772f04b26387e1a96a4b5461435997897 100644 (file)
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -244,7 +244,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index e39e60885a004c8f1e4c2a653a5d65a6618fc0af..036321f12eb521a6272073afd403eed1268450ca 100644 (file)
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -241,7 +241,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #

diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 026e206532e1a08e6f4923a5939db28a3441a4c2..804547669f435a185eba9d755d55c730259429ca 100644 (file)
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -240,7 +240,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #

diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 884ec7da958e2b902ab04e3984c71b39c3b4bec3..a24a53e74964de71c1ad21956022505170cc3eec 100644 (file)
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -240,7 +240,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 4ec53f9faaf44aabccb91969e597f8402b378727..ceb80d67ed08c353ada7ed77ba18b37373dd3a20 100644 (file)
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -226,7 +226,6 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 # BR2_LARGEFILE is not set
 # BR2_INET_IPV6 is not set
 # BR2_INET_RPC is not set

diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index b5c34df08c5a972421d8e34c7d37cc59511c4225..46503ab9fd3ad9b47d30af14fb70dd161089394b 100644 (file)
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -227,7 +227,6 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y

diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 1d0aa61b463fb1d0edff8a0964753d6f7d595445..0db786644906cca30bc91a3f811a31309fc16455 100644 (file)
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -229,7 +229,6 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 # BR2_LARGEFILE is not set
 # BR2_INET_IPV6 is not set
 # BR2_INET_RPC is not set

diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 5ba28991ef7388239f19dc6f888529286f5a0dc6..7a273e18da35e8e1e0056717fa8e0e71792fb646 100644 (file)
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -202,7 +202,6 @@ BR2_GDB_VERSION="6.7.1"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y

diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index 49b7eb3fd4848d78c1d7ca6e2b7335a41144aae3..200ff21699e3d316e8395f4f80e8d55e79319b70 100644 (file)
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -77,7 +77,6 @@ BR2_GDB_VERSION="6.8"
 #
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
-# BR2_ENABLE_MULTILIB is not set
 BR2_LARGEFILE=y
 BR2_INET_RPC=y
 BR2_TARGET_OPTIMIZATION="-Os -pipe"

diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index d1af87747a4f637ef7d924b016d93a6dc58c5753..371509f4ebdc5530fe31329357a1ebdca83509b8 100644 (file)
--- 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 93dbbb0079a8ab4dc68f6525c43aefc66d49d4e3..e44707c5785b970e344941a16414a8e8b0599c74 100644 (file)
--- 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 d9269bd230003884e427e964dba6a19edbb25d1c..b87270f8f83b28401c9ff6442e7c180854eab25c 100644 (file)
--- 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 512a6084481652345cc18be85ad717e5b78f6258..2a17796faccfd87c0eac1265054f972bd43d554d 100644 (file)
--- 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