NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain: remove multilib

Browse Source 
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 <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-07-28 12:07:04 +02:00
parent 6d4a992e2b
commit 5575d205c3
22 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/arm_toolchain_defconfig
View File

@ -284,7 +284,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
# BR2_VFP_FLOAT is not set # BR2_VFP_FLOAT is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y

1
configs/at91rm9200df_defconfig
View File

@ -299,7 +299,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
BR2_PACKAGE_SSTRIP_TARGET=y BR2_PACKAGE_SSTRIP_TARGET=y
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
# BR2_VFP_FLOAT is not set # BR2_VFP_FLOAT is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y

1
configs/at91sam9260dfc_defconfig
View File

@ -305,7 +305,6 @@ BR2_GDB_VERSION="6.8"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
BR2_PACKAGE_SSTRIP_TARGET=y BR2_PACKAGE_SSTRIP_TARGET=y
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_IPV6=y BR2_INET_IPV6=y
BR2_INET_RPC=y BR2_INET_RPC=y

1
configs/at91sam9260pf_defconfig
View File

@ -205,7 +205,6 @@ BR2_CCACHE=y
# #
BR2_PACKAGE_SSTRIP_TARGET=y BR2_PACKAGE_SSTRIP_TARGET=y
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_IPV6=y BR2_INET_IPV6=y
BR2_INET_RPC=y BR2_INET_RPC=y

1
configs/at91sam9261ek_defconfig
View File

@ -299,7 +299,6 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_IPV6=y BR2_INET_IPV6=y
BR2_INET_RPC=y BR2_INET_RPC=y

1
configs/at91sam9263ek_defconfig
View File

@ -304,7 +304,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
# BR2_VFP_FLOAT is not set # BR2_VFP_FLOAT is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y

1
configs/at91sam9g20dfc_defconfig
View File

@ -304,7 +304,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
BR2_PACKAGE_SSTRIP_TARGET=y BR2_PACKAGE_SSTRIP_TARGET=y
BR2_PACKAGE_SSTRIP_HOST=y BR2_PACKAGE_SSTRIP_HOST=y
# BR2_ENABLE_MULTILIB is not set
# BR2_VFP_FLOAT is not set # BR2_VFP_FLOAT is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y

1
configs/atngw100-base_defconfig
View File

@ -230,7 +230,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
# BR2_CROSS_TOOLCHAIN_TARGET_UTILS is not set # BR2_CROSS_TOOLCHAIN_TARGET_UTILS is not set
# #

1
configs/atngw100_defconfig
View File

@ -225,7 +225,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
# #

1
configs/atstk1005_defconfig
View File

@ -244,7 +244,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
# #

1
configs/atstk100x_defconfig
View File

@ -241,7 +241,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
# #

1
configs/i386_defconfig
View File

@ -240,7 +240,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
# #

1
configs/i686_defconfig
View File

@ -240,7 +240,6 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
# #

1
configs/integrator926_defconfig
View File

@ -226,7 +226,6 @@ BR2_GCC_SHARED_LIBGCC=y
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
# BR2_LARGEFILE is not set # BR2_LARGEFILE is not set
# BR2_INET_IPV6 is not set # BR2_INET_IPV6 is not set
# BR2_INET_RPC is not set # BR2_INET_RPC is not set

1
configs/integrator926_huge_defconfig
View File

@ -227,7 +227,6 @@ BR2_GCC_SHARED_LIBGCC=y
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_IPV6=y BR2_INET_IPV6=y
BR2_INET_RPC=y BR2_INET_RPC=y

1
configs/kb9202_defconfig
View File

@ -229,7 +229,6 @@ BR2_GCC_SHARED_LIBGCC=y
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
# BR2_LARGEFILE is not set # BR2_LARGEFILE is not set
# BR2_INET_IPV6 is not set # BR2_INET_IPV6 is not set
# BR2_INET_RPC is not set # BR2_INET_RPC is not set

1
configs/v100sc2_defconfig
View File

@ -202,7 +202,6 @@ BR2_GDB_VERSION="6.7.1"
# BR2_MKLIBS is not set # BR2_MKLIBS is not set
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_IPV6=y BR2_INET_IPV6=y
BR2_INET_RPC=y BR2_INET_RPC=y

1
target/xtensa/defconfig
View File

@ -77,7 +77,6 @@ BR2_GDB_VERSION="6.8"
# #
# BR2_PACKAGE_SSTRIP_TARGET is not set # BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set # BR2_PACKAGE_SSTRIP_HOST is not set
# BR2_ENABLE_MULTILIB is not set
BR2_LARGEFILE=y BR2_LARGEFILE=y
BR2_INET_RPC=y BR2_INET_RPC=y
BR2_TARGET_OPTIMIZATION="-Os -pipe" BR2_TARGET_OPTIMIZATION="-Os -pipe"

6
toolchain/Makefile.in
View File

@ -4,12 +4,6 @@ else
THREADS:=--enable-threads THREADS:=--enable-threads
endif 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_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/
BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR) BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)
BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin

2
toolchain/binutils/binutils.mk
View File

@ -74,7 +74,6 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
$(BR2_CONFIGURE_DEVEL_SYSROOT) \ $(BR2_CONFIGURE_DEVEL_SYSROOT) \
$(BR2_CONFIGURE_STAGING_SYSROOT) \ $(BR2_CONFIGURE_STAGING_SYSROOT) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(MULTILIB) \
--disable-werror \ --disable-werror \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \
$(EXTRA_BINUTILS_CONFIG_OPTIONS) \ $(EXTRA_BINUTILS_CONFIG_OPTIONS) \
@ -128,7 +127,6 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(MULTILIB) \
$(BINUTILS_TARGET_CONFIG_OPTIONS) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \
--disable-werror \ --disable-werror \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \

5
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -167,7 +167,7 @@ ifeq ("$(strip $(ARCH))","armeb")
endif endif
endif endif
ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y) 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 toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
endif endif
endif endif
@ -206,7 +206,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
$(GCC_WITH_HOST_MPFR) \ $(GCC_WITH_HOST_MPFR) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(THREADS) \ $(THREADS) \
$(MULTILIB) \
$(GCC_DECIMAL_FLOAT) \ $(GCC_DECIMAL_FLOAT) \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(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) \ $(GCC_WITH_HOST_MPFR) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(THREADS) \ $(THREADS) \
$(MULTILIB) \
$(GCC_DECIMAL_FLOAT) \ $(GCC_DECIMAL_FLOAT) \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(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) \ $(GCC_WITH_TARGET_MPFR) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(THREADS) \ $(THREADS) \
$(MULTILIB) \
$(GCC_DECIMAL_FLOAT) \ $(GCC_DECIMAL_FLOAT) \
$(SOFT_FLOAT_CONFIG_OPTION) \ $(SOFT_FLOAT_CONFIG_OPTION) \
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \

5
toolchain/toolchain-buildroot/Config.in.2
View File

@ -5,11 +5,6 @@ source "toolchain/elf2flt/Config.in"
source "toolchain/mklibs/Config.in" source "toolchain/mklibs/Config.in"
source "toolchain/sstrip/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 config BR2_VFP_FLOAT
bool "Use ARM Vector Floating Point unit" bool "Use ARM Vector Floating Point unit"
depends on !BR2_SOFT_FLOAT depends on !BR2_SOFT_FLOAT