diff -r b2b6b1d46aa1 -r f89ccf3ea5d6 config/cc/gcc.in
--- a/config/cc/gcc.in	Sat Jul 19 12:17:26 2008 +0000
+++ b/config/cc/gcc.in	Thu Aug 07 13:55:30 2008 +0000
@@ -129,12 +129,49 @@
 
 config CC_CXA_ATEXIT
     bool
-    prompt "__cxa_atexit"
-    default "y"
+    prompt "Use __cxa_atexit"
+    default y
     help
       If you get the missing symbol "__cxa_atexit" when building C++ programs,
       you might want to try disabling this option.
 
+choice
+    bool
+    prompt "Use sjlj for exceptions"
+    default CC_SJLJ_EXCEPTIONS_CONFIGURE
+
+# This config option is used nowhere in the code on purpose.
+# It only serves as a choice entry to force neither using nor not using sjlj
+config CC_SJLJ_EXCEPTIONS_CONFIGURE
+    bool
+    prompt "Let configure decide"
+    help
+      Let configure decide if setjmp/longjmp should be used to handle
+      exceptions.
+      
+      Choose that if you trust configure to detect the correct settings.
+      This is the default choice.
+
+config CC_SJLJ_EXCEPTIONS_USE
+    bool
+    prompt "Force using sjlj"
+    help
+      Do use setjmp/longjmp for exceptions.
+      This is gcc's --enable-sjlj-exceptions configure switch.
+      
+      Choose that if you want to use setjmp/longjmp to handle exceptions.
+
+config CC_SJLJ_EXCEPTIONS_DONT_USE
+    bool
+    prompt "Force not using sjlj"
+    help
+      Do not use setjmp/longjmp for exceptions.
+      This is gcc's --disable-sjlj-exceptions configure switch.
+      
+      Choose that if you want to not use setjmp/longjmp to handle exceptions.
+
+endchoice
+
 config CC_CORE_EXTRA_CONFIG
     string
     prompt "Core gcc extra config"