Przeglądaj źródła

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>
Thomas Petazzoni 15 lat temu
rodzic
commit
6d4a992e2b

+ 0 - 1
configs/arm_toolchain_defconfig

@@ -245,7 +245,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/at91rm9200df_defconfig

@@ -250,7 +250,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/at91sam9260dfc_defconfig

@@ -267,7 +267,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/at91sam9260pf_defconfig

@@ -173,7 +173,6 @@ BR2_GCC_VERSION_4_2_1=y
 # BR2_GCC_IS_SNAP is not set
 # BR2_GCC_IS_SNAP is not set
 BR2_GCC_VERSION="4.2.1"
 BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/at91sam9261ek_defconfig

@@ -270,7 +270,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/at91sam9263ek_defconfig

@@ -264,7 +264,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/at91sam9g20dfc_defconfig

@@ -264,7 +264,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/atngw100-base_defconfig

@@ -196,7 +196,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_TOOLCHAIN_SYSROOT is not set
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_SHARED_LIBGCC is not set
 # BR2_GCC_SHARED_LIBGCC is not set
 
 

+ 0 - 1
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_SUPPORTS_SYSROOT=y
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 BR2_GCC_SHARED_LIBGCC=y
 BR2_GCC_ENABLE_TLS=y
 BR2_GCC_ENABLE_TLS=y

+ 0 - 1
configs/atstk1005_defconfig

@@ -200,7 +200,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 BR2_GCC_SHARED_LIBGCC=y
 
 

+ 0 - 1
configs/atstk100x_defconfig

@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_SHARED_LIBGCC=y
 BR2_GCC_SHARED_LIBGCC=y
 
 

+ 0 - 1
configs/i386_defconfig

@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.4.0"
 BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/i686_defconfig

@@ -195,7 +195,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.4.0"
 BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_LIBGCJ is not set

+ 0 - 1
configs/integrator926_defconfig

@@ -199,7 +199,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_CXX is not set
 # BR2_GCC_CROSS_CXX is not set
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/integrator926_huge_defconfig

@@ -199,7 +199,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.3.2"
 BR2_GCC_VERSION="4.3.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/kb9202_defconfig

@@ -201,7 +201,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.4"
 BR2_GCC_VERSION="4.2.4"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
 # BR2_GCC_CROSS_FORTRAN is not set

+ 0 - 1
configs/v100sc2_defconfig

@@ -170,7 +170,6 @@ BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2"
 BR2_GCC_VERSION="4.2.2"
 BR2_TOOLCHAIN_SYSROOT=y
 BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 BR2_GCC_CROSS_CXX=y
 BR2_GCC_CROSS_CXX=y
 BR2_INSTALL_LIBSTDCPP=y
 BR2_INSTALL_LIBSTDCPP=y

+ 0 - 8
toolchain/gcc/Config.in

@@ -68,14 +68,6 @@ config BR2_GCC_VERSION
 	default "4.4.4"     if BR2_GCC_VERSION_4_4_X
 	default "4.4.4"     if BR2_GCC_VERSION_4_4_X
 	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 	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
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
 	string "Additional gcc options"
 	default ""
 	default ""

+ 0 - 4
toolchain/gcc/Makefile.in

@@ -13,10 +13,6 @@ else
 GCC_SNAP_DATE:=
 GCC_SNAP_DATE:=
 endif
 endif
 
 
-ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y)
-GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions
-endif
-
 ifeq ($(BR2_SOFT_FLOAT),y)
 ifeq ($(BR2_SOFT_FLOAT),y)
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
 SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm
 ifeq ($(BR2_arm)$(BR2_armeb),y) # only set float-abi for arm

+ 0 - 2
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) \
 		$(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) \
-		$(GCC_USE_SJLJ_EXCEPTIONS) \
 		$(DISABLE_LARGEFILE) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 		$(EXTRA_GCC2_CONFIG_OPTIONS) \
@@ -424,7 +423,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
 		$(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) \
-		$(GCC_USE_SJLJ_EXCEPTIONS) \
 		$(DISABLE_LARGEFILE) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \