gcc: remove option on SJLJ exceptions

This is a very advanced option, and it seems, according to
http://choices.cs.uiuc.edu/exceptions.pdf that SJLJ exceptions aren't
really interesting.

Users really interested by this can always use the
BR2_EXTRA_GCC_CONFIG_OPTIONS is they want.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 3062541cc65ab4fed85a11801684a8efb068ca81..2ac7de3bec815a165d2bc7c3c50330d49be4292d 100644 (file)
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -245,7 +245,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 98158b98514db68123c86e95b2bce8d68267bfa8..2a193cfaf8293f1b0e91b8da0cce42c75bc955c4 100644 (file)
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -250,7 +250,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index f1d63df2e061ee09750610111048688ce747895a..98d3401c3df464f5b7144b23b6fdb152b6b5fc85 100644 (file)
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -267,7 +267,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index 651041fd38e844671a6797c8c5c8a57685290851..ec4005d1a49d9b54808fb65c70fe7e557f9a8a4d 100644 (file)
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -173,7 +173,6 @@ BR2_GCC_VERSION_4_2_1=y
 # BR2_GCC_IS_SNAP is not set
 BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 0d2fa0b060429cdf8f979b2b5b3af31d762812ff..7524c68680487b295d29da48431bad14a5b86a4c 100644 (file)
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -270,7 +270,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 6b4f592ff3878ef7d557bb508e7ec2c64e2364ee..85ccedee804dfd286b83a5754da659bf3a8ae7c6 100644 (file)
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -264,7 +264,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 92171d5e870d07a703429bcaeb07c624fb4de586..57d72aeaf0dea8e5a35acd95407f0f6b73049c35 100644 (file)
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -264,7 +264,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index f5eba61aab1a02ef267f97bfbfcc178c3a2b84ee..270c056ecf22bb29d596ee4a511f4c5a453a4104 100644 (file)
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -196,7 +196,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 # BR2_TOOLCHAIN_SYSROOT is not set
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_SHARED_LIBGCC is not set
 

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index d1db2da38379c55164938ee59b46055e95e2e9f3..a78372df2e8a92c3013cff0b147a487d628f7b6c 100644 (file)
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -174,7 +174,6 @@ BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 BR2_GCC_ENABLE_TLS=y

diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index b90761b723c3d47afa44258e591a98a9881ad6ae..451e248e0df3ef73512b6dffdecb7139d687010e 100644 (file)
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -200,7 +200,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index c12ccf88a4f8764d608c85c4933843daff90df84..e39e60885a004c8f1e4c2a653a5d65a6618fc0af 100644 (file)
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 

diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 65825bee425e248fcb6425755adf3b988164daa4..026e206532e1a08e6f4923a5939db28a3441a4c2 100644 (file)
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 31ce604fd4143531e342eab80f84f766db2ff0f2..884ec7da958e2b902ab04e3984c71b39c3b4bec3 100644 (file)
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 2eb22c5d1d0e581d800409e1cbbdbdf318c38b2c..4ec53f9faaf44aabccb91969e597f8402b378727 100644 (file)
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -199,7 +199,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_CXX is not set
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index e44ac5fbaae5738535e8583a82d29d48e4b8ed42..b5c34df08c5a972421d8e34c7d37cc59511c4225 100644 (file)
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -199,7 +199,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 40c6d1820fff68fc62cb5117821b91e33a3542df..1d0aa61b463fb1d0edff8a0964753d6f7d595445 100644 (file)
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -201,7 +201,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.4"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set

diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index ca261ee4204f46bdba76c9c54cbf6a8cc50888e2..5ba28991ef7388239f19dc6f888529286f5a0dc6 100644 (file)
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -170,7 +170,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2"
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_INSTALL_LIBSTDCPP=y

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 31eba6bfb52fdfc9a694b635cee6e060fbd229ce..cbdc02699c6ce56c8fc35476268cfeef28ee50d4 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -68,14 +68,6 @@ config BR2_GCC_VERSION
        default "4.4.4"     if BR2_GCC_VERSION_4_4_X
        default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
-config BR2_GCC_USE_SJLJ_EXCEPTIONS
-       bool "Enable setjmp/longjmp exceptions?"
-       help
-         For some platforms, proper stack unwinding works perfectly,
-         while other platforms must use setjmp/longjmp exceptions for
-         proper stack unwinding during exception handling.  Most people
-         can leave this set to n.
-
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
        string "Additional gcc options"
        default ""

diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index 9537e9dc74a1a1287178d19f01e81c342ffea1b2..b6ebca902ff76acfa94508d2c1af7ba33c9c2455 100644 (file)
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -13,10 +13,6 @@ else
 GCC_SNAP_DATE:=
 endif
 
-ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y)
-GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions
-endif
-
 ifeq ($(BR2_SOFT_FLOAT),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index dfc1790a999cdf80b889f52ba2ffc01304b7b555..d9269bd230003884e427e964dba6a19edbb25d1c 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -290,7 +290,6 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
                $(GCC_DECIMAL_FLOAT) \
                $(SOFT_FLOAT_CONFIG_OPTION) \
                $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
-               $(GCC_USE_SJLJ_EXCEPTIONS) \
                $(DISABLE_LARGEFILE) \
                $(EXTRA_GCC_CONFIG_OPTIONS) \
                $(EXTRA_GCC2_CONFIG_OPTIONS) \
@@ -424,7 +423,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
                $(GCC_DECIMAL_FLOAT) \
                $(SOFT_FLOAT_CONFIG_OPTION) \
                $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
-               $(GCC_USE_SJLJ_EXCEPTIONS) \
                $(DISABLE_LARGEFILE) \
                $(EXTRA_GCC_CONFIG_OPTIONS) \
                $(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \