make TLS support configurable

SVN-Revision: 19870
This commit is contained in:
Imre Kaloz 2010-02-26 11:01:28 +00:00
parent 2eebf6e0bd
commit c354852432
2 changed files with 14 additions and 2 deletions

View File

@ -81,6 +81,14 @@ config SSP_SUPPORT
help help
Enable Stack-Smashing Protection support Enable Stack-Smashing Protection support
config TLS_SUPPORT
bool
depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
default n
help
Enable Thread-local storage support
config INSTALL_LIBSTDCPP config INSTALL_LIBSTDCPP
bool bool
prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS

View File

@ -2,7 +2,7 @@
# Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org> # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
# Copyright (C) 2005-2006 Felix Fietkau <nbd@openwrt.org> # Copyright (C) 2005-2006 Felix Fietkau <nbd@openwrt.org>
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -116,6 +116,11 @@ else
--disable-libssp --disable-libssp
endif endif
ifeq ($(CONFIG_TLS_SUPPORT),)
GCC_CONFIGURE+= \
--disable-tls
endif
ifneq ($(CONFIG_EXTRA_TARGET_ARCH),) ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
GCC_CONFIGURE+= \ GCC_CONFIGURE+= \
--enable-biarch \ --enable-biarch \
@ -152,7 +157,6 @@ GCC_CONFIGURE_STAGE2:= \
--enable-languages=$(TARGET_LANGUAGES) \ --enable-languages=$(TARGET_LANGUAGES) \
--enable-shared \ --enable-shared \
--enable-threads \ --enable-threads \
--disable-tls \
--with-slibdir=$(TOOLCHAIN_DIR)/lib \ --with-slibdir=$(TOOLCHAIN_DIR)/lib \
ifdef CONFIG_powerpc ifdef CONFIG_powerpc