From e5f3082b3db90894ab03c3055d50cd4d0fa74707 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Jul 2010 21:28:54 +0200 Subject: cc/gcc: move options around diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 790380c..281b5b6 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -130,15 +130,12 @@ config CC_GCC_4_4_or_later bool default n select CC_GCC_4_3_or_later - select CC_GCC_4_2_or_later select CC_GCC_USE_PPL_CLOOG config CC_GCC_4_5_or_later bool default n select CC_GCC_4_4_or_later - select CC_GCC_4_3_or_later - select CC_GCC_4_2_or_later select CC_GCC_USE_MPC_LIBELF config CC_GCC_USE_GMP_MPFR @@ -183,52 +180,31 @@ config CC_VERSION default "4.0.4" if CC_V_4_0_4 default "3.4.6" if CC_V_3_4_6 -config CC_CXA_ATEXIT +config CC_LANG_JAVA_USE_ECJ bool - prompt "Use __cxa_atexit" default y - depends on ! BARE_METAL - 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 - depends on ! BARE_METAL + depends on CC_LANG_JAVA + depends on CC_GCC_4_3_or_later -# 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" +config CC_PKGVERSION + string + prompt "gcc ID string" + depends on CC_GCC_4_3_or_later + default "crosstool-NG-${CT_VERSION}" 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. + Specify a string that identifies your package. You may wish to include + a build number or build date. This version string will be included in + the output of gcc --version. -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. + This is passed to the configure flag --with-pkgversion. -config CC_SJLJ_EXCEPTIONS_DONT_USE - bool - prompt "Force not using sjlj" +config CC_BUGURL + string + prompt "gcc bug URL" + depends on CC_GCC_4_3_or_later + default "" 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 + Specify the URL that users should visit if they wish to report a bug. config CC_ENABLE_CXX_FLAGS string @@ -258,50 +234,3 @@ config CC_EXTRA_CONFIG depends on ! BARE_METAL help Extra flags to pass onto ./configure when configuring gcc. - -config CC_GCC_ENABLE_TARGET_OPTSPACE - bool - prompt "Optimize gcc libs for size" - default y - help - Pass --enable-target-optspace to crossgcc's configure. - - This will compile crossgcc's libs with -Os. - -config CC_GCC_DISABLE_PCH - bool - prompt "Do not build PCH" - default n - help - Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain. - at the expense of speed when compiling C++ code. - - For some configurations (most notably canadian?), PCH are broken, and - need to be disabled. Please see: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974 - -config CC_PKGVERSION - string - prompt "gcc ID string" - depends on CC_GCC_4_3_or_later - default "crosstool-NG-${CT_VERSION}" - help - Specify a string that identifies your package. You may wish to include - a build number or build date. This version string will be included in - the output of gcc --version. - - This is passed to the configure flag --with-pkgversion. - -config CC_BUGURL - string - prompt "gcc bug URL" - depends on CC_GCC_4_3_or_later - default "" - help - Specify the URL that users should visit if they wish to report a bug. - -config CC_LANG_JAVA_USE_ECJ - bool - default y - depends on CC_LANG_JAVA - depends on CC_GCC_4_3_or_later diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 new file mode 100644 index 0000000..db52883 --- /dev/null +++ b/config/cc/gcc.in.2 @@ -0,0 +1,69 @@ +config CC_GCC_ENABLE_TARGET_OPTSPACE + bool + prompt "Optimize gcc libs for size" + default y + help + Pass --enable-target-optspace to crossgcc's configure. + + This will compile crossgcc's libs with -Os. + +comment "Misc. obscure options." + +config CC_CXA_ATEXIT + bool + prompt "Use __cxa_atexit" + default y + depends on ! BARE_METAL + help + If you get the missing symbol "__cxa_atexit" when building C++ programs, + you might want to try disabling this option. + +config CC_GCC_DISABLE_PCH + bool + prompt "Do not build PCH" + default n + help + Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain. + at the expense of speed when compiling C++ code. + + For some configurations (most notably canadian?), PCH are broken, and + need to be disabled. Please see: + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974 + +choice + bool + prompt "Use sjlj for exceptions" + default CC_SJLJ_EXCEPTIONS_CONFIGURE + depends on ! BARE_METAL + +# 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 -- cgit v0.10.2-6-g49f6