diff options
author | Aldy Hernandez <aldyh@redhat.com> | 2011-11-08 03:20:30 +0000 |
---|---|---|
committer | Aldy Hernandez <aldyh@redhat.com> | 2011-11-08 03:20:30 +0000 |
commit | 47180e1668b0766d1e473fed8d9385c0e765285d (patch) | |
tree | 1eb48ad31d05a9ce117bedc17115de96dffa2f0b /gcc/configure | |
parent | 80b9b1c40004ddf7dd74248b642d489384f37ace (diff) | |
parent | eb6a1d75b768b663579adeb2a50828cf679b6f12 (diff) |
* Merge from mainline rev 181122.transactional-memory
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/transactional-memory@181148 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
-rwxr-xr-x | gcc/configure | 97 |
1 files changed, 46 insertions, 51 deletions
diff --git a/gcc/configure b/gcc/configure index 0540430dc20..99334ce44fd 100755 --- a/gcc/configure +++ b/gcc/configure @@ -618,12 +618,9 @@ xm_include_list xm_file_list tm_p_include_list tm_p_file_list -libgcc_tm_include_list -libgcc_tm_file_list tm_defines tm_include_list tm_file_list -thread_file common_out_object_file common_out_file out_object_file @@ -645,7 +642,6 @@ gcc_config_arguments float_h_file extra_programs extra_passes -extra_parts extra_objs extra_headers_list user_headers_inc_next_post @@ -671,7 +667,6 @@ all_gtfiles all_compilers srcdir subdirs -slibdir dollar gcc_tooldir enable_lto @@ -728,7 +723,6 @@ LIBINTL USE_NLS extra_opt_files extra_modes_file -gthread_flags NATIVE_SYSTEM_HEADER_DIR objext manext @@ -777,6 +771,7 @@ valgrind_path_defines valgrind_path TREEBROWSER nocommon_flag +noexception_flags warn_cxxflags warn_cflags c_strict_warn @@ -918,7 +913,6 @@ with_gc with_system_zlib enable_maintainer_mode enable_version_specific_runtime_libs -with_slibdir enable_plugin enable_libquadmath_support with_linker_hash_style @@ -1674,7 +1668,6 @@ Optional Packages: --with-gc={page,zone} choose the garbage collection mechanism to use with the compiler --with-system-zlib use installed libz - --with-slibdir=DIR shared libraries in DIR [LIBDIR] --with-linker-hash-style={sysv,gnu,both} specify the linker hash style @@ -6402,11 +6395,12 @@ fi # * 'long long' # * variadic macros # * overlong strings +# * C++11 narrowing conversions in { } # So, we only use -pedantic if we can disable those warnings. loose_warn= save_CFLAGS="$CFLAGS" -for option in -W -Wall -Wwrite-strings -Wcast-qual; do +for option in -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual; do as_acx_Woption=`$as_echo "acx_cv_prog_cc_warning_$option" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5 @@ -6620,6 +6614,47 @@ fi +# Disable exceptions and RTTI if building with g++ +noexception_flags= +save_CFLAGS="$CFLAGS" +for option in -fno-exceptions -fno-rtti; do + as_acx_Woption=`$as_echo "acx_cv_prog_cc_warning_$option" | $as_tr_sh` + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5 +$as_echo_n "checking whether $CC supports $option... " >&6; } +if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + CFLAGS="$option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_acx_Woption=yes" +else + eval "$as_acx_Woption=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +eval ac_res=\$$as_acx_Woption + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if test `eval 'as_val=${'$as_acx_Woption'};$as_echo "$as_val"'` = yes; then : + noexception_flags="$noexception_flags${noexception_flags:+ }$option" +fi + done +CFLAGS="$save_CFLAGS" + + # Enable expensive internal checks is_release= if test x"`cat $srcdir/DEV-PHASE`" != xexperimental; then @@ -11359,19 +11394,6 @@ if test x${thread_file} = x; then thread_file=${target_thread_file} fi -# Make gthr-default.h if we have a thread file. -gthread_flags= -if test $thread_file != single; then - echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h-t - if diff gthr-default.h-t gthr-default.h 2>/dev/null; then - rm -f gthr-default.h-t - else - mv -f gthr-default.h-t gthr-default.h - fi - gthread_flags=-DHAVE_GTHR_DEFAULT -fi - - # -------- # UNSORTED # -------- @@ -11793,13 +11815,6 @@ for f in $tm_file; do esac done -libgcc_tm_file_list= -libgcc_tm_include_list= -for f in $libgcc_tm_file; do - libgcc_tm_file_list="${libgcc_tm_file_list} \$(srcdir)/../libgcc/config/$f" - libgcc_tm_include_list="${libgcc_tm_include_list} ../libgcc/config/$f" -done - tm_p_file_list= tm_p_include_list= for f in $tm_p_file; do @@ -18072,7 +18087,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18075 "configure" +#line 18090 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18178,7 +18193,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18181 "configure" +#line 18196 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26957,22 +26972,6 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi - -# Check whether --with-slibdir was given. -if test "${with_slibdir+set}" = set; then : - withval=$with_slibdir; slibdir="$with_slibdir" -else - if test "${enable_version_specific_runtime_libs+set}" = set; then - slibdir='$(libsubdir)' -elif test "$host" != "$target"; then - slibdir='$(build_tooldir)/lib' -else - slibdir='$(libdir)' -fi -fi - - - # Substitute configuration variables @@ -27036,10 +27035,6 @@ fi - - - - # Echo link setup. if test x${build} = x${host} ; then if test x${host} = x${target} ; then |