diff options
author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
---|---|---|
committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/configure | |
parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/configure')
-rwxr-xr-x | gcc-4.9/gcc/configure | 190 |
1 files changed, 169 insertions, 21 deletions
diff --git a/gcc-4.9/gcc/configure b/gcc-4.9/gcc/configure index 0df58deb1..f7edc71d1 100755 --- a/gcc-4.9/gcc/configure +++ b/gcc-4.9/gcc/configure @@ -768,6 +768,7 @@ CONFIGURE_SPECS CROSS_SYSTEM_HEADER_DIR TARGET_SYSTEM_ROOT_DEFINE TARGET_SYSTEM_ROOT +RUNTIME_ROOT_PREFIX_DEFINE SYSROOT_CFLAGS_FOR_TARGET enable_shared enable_fixed_point @@ -895,6 +896,7 @@ with_dwarf2 enable_shared with_native_system_header_dir with_build_sysroot +with_runtime_root_prefix with_sysroot with_specs with_pkgversion @@ -929,9 +931,11 @@ with_system_zlib enable_maintainer_mode enable_link_mutex enable_version_specific_runtime_libs +enable_canonical_prefixes enable_plugin enable_host_shared enable_libquadmath_support +with_warn_frame_larger_than_extra_text with_linker_hash_style ' ac_precious_vars='build_alias @@ -1652,6 +1656,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory + --enable-canonical-prefixes + enable or disable prefix canonicalization --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support @@ -1679,6 +1685,10 @@ Optional Packages: system header files in. Defaults to /usr/include. --with-build-sysroot=sysroot use sysroot as the system root during the build + --with-runtime-root-prefix=prefix + prepend prefix to paths used by the compiler to + name the dynamic linker and other files used at + runtime. Defaults to empty (no prefix). --with-sysroot[=DIR] search for usr/lib, usr/include, et al, within DIR --with-specs=SPECS add SPECS to driver command-line processing --with-pkgversion=PKG Use PKG in the version string in place of "GCC" @@ -1698,6 +1708,8 @@ Optional Packages: choose the garbage collection mechanism to use with the compiler --with-system-zlib use installed libz + --with-warn-frame-larger-than-extra-text=TEXT + specifies extra text for frame size warnings --with-linker-hash-style={sysv,gnu,both} specify the linker hash style @@ -7160,6 +7172,23 @@ fi + +# Check whether --with-runtime-root-prefix was given. +if test "${with_runtime_root_prefix+set}" = set; then : + withval=$with_runtime_root_prefix; + case ${with_runtime_root_prefix} in + yes|no) as_fn_error "bad value ${withval} given for runtime root prefix" "$LINENO" 5 ;; + /*) ;; + *) as_fn_error "${withval} should be an absolute directory" "$LINENO" 5 ;; + esac + RUNTIME_ROOT_PREFIX_DEFINE="-DRUNTIME_ROOT_PREFIX=\\\"${withval}\\\"" + +else + RUNTIME_ROOT_PREFIX_DEFINE="" +fi + + + if test "x$prefix" = xNONE; then test_prefix=/usr/local else @@ -11840,6 +11869,12 @@ esac cat >>confdefs.h <<_ACEOF +#define FRPLUGINSONAME "${host_function_reordering_plugin_soname}" +_ACEOF + + + +cat >>confdefs.h <<_ACEOF #define LTOPLUGINSONAME "${host_lto_plugin_soname}" _ACEOF @@ -14532,7 +14567,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -17931,7 +17981,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17930 "configure" +#line 17984 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18037,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 18036 "configure" +#line 18090 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26840,25 +26890,25 @@ if test "${enable_eh_frame_hdr_for_static+set}" = set; then : value for --enable-eh-frame-hdr-for-static. Valid choices are 'yes' and 'no'." "$LINENO" 5 ;; esac -else - # Only support for glibc 2.3.0 or higher with AT_PHDR/AT_PHNUM from -# Linux kernel. - if test x$host = x$build -a x$host = x$target && - ldd --version 2>&1 >/dev/null && - glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then - glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` - glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"` - glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` - if test "$glibcnum" -ge 2003 ; then - auvx=`LD_SHOW_AUXV=1 ldd 2>/dev/null` - if echo "$auvx" | grep AT_PHDR > /dev/null && - echo "$auvx" | grep AT_PHNUM > /dev/null; then - enable_eh_frame_hdr_for_static=yes - fi - fi - fi fi +## Only support for glibc 2.3.0 or higher with AT_PHDR/AT_PHNUM from +## Linux kernel. +# [[if test x$host = x$build -a x$host = x$target && +# ldd --version 2>&1 >/dev/null && +# glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then +# glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` +# glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"` +# glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` +# if test "$glibcnum" -ge 2003 ; then +# auvx=`LD_SHOW_AUXV=1 ldd 2>/dev/null` +# if echo "$auvx" | grep AT_PHDR > /dev/null && +# echo "$auvx" | grep AT_PHNUM > /dev/null; then +# enable_eh_frame_hdr_for_static=yes +# fi +# fi +# fi]]) + if test x$enable_eh_frame_hdr_for_static = xyes; then $as_echo "#define USE_EH_FRAME_HDR_FOR_STATIC 1" >>confdefs.h @@ -27129,6 +27179,34 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker mapfile support for clearing hardware capabilities" >&5 +$as_echo_n "checking linker mapfile support for clearing hardware capabilities... " >&6; } +saved_LDFLAGS="$LDFLAGS" +for clearcap_map in sol2-clearcapv2.map sol2-clearcap.map; do + LDFLAGS="$saved_LDFLAGS -Wl,-M,${srcdir}/config/$clearcap_map" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void) {return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gcc_cv_ld_clearcap=yes; break +else + gcc_cv_ld_clearcap=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +done +LDFLAGS="$saved_LDFLAGS" +if test "x$gcc_cv_ld_clearcap" = xyes; then + +$as_echo "#define HAVE_LD_CLEARCAP 1" >>confdefs.h + + ac_config_links="$ac_config_links clearcap.map:${srcdir}/config/$clearcap_map" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_clearcap" >&5 +$as_echo "$gcc_cv_ld_clearcap" >&6; } + case "$target:$tm_file" in powerpc64-*-freebsd* | powerpc64*-*-linux* | powerpc*-*-linux*rs6000/biarch64.h*) case "$target" in @@ -27775,6 +27853,21 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi +# Set default prefix canonicalization. + +# Check whether --enable-canonical-prefixes was given. +if test "${enable_canonical_prefixes+set}" = set; then : + enableval=$enable_canonical_prefixes; +else + enable_canonical_prefixes=yes +fi + +if test x"$enable_canonical_prefixes" = xyes; then + +$as_echo "#define ENABLE_CANONICAL_PREFIXES 1" >>confdefs.h + +fi + # Substitute configuration variables @@ -28085,6 +28178,24 @@ $as_echo "#define ENABLE_LIBQUADMATH_SUPPORT 1" >>confdefs.h fi +warn_frame_larger_than_extra_text= + +# Check whether --with-warn-frame-larger-than-extra-text was given. +if test "${with_warn_frame_larger_than_extra_text+set}" = set; then : + withval=$with_warn_frame_larger_than_extra_text; case "${withval}" in +yes) as_fn_error "bad value ${withval} given for frame size warning text" "$LINENO" 5 ;; +no) ;; +*) warn_frame_larger_than_extra_text="$withval" ;; +esac +fi + + +cat >>confdefs.h <<_ACEOF +#define WARN_FRAME_LARGER_THAN_EXTRA_TEXT "$warn_frame_larger_than_extra_text" +_ACEOF + + + # Specify what hash style to use by default. # Check whether --with-linker-hash-style was given. @@ -28658,6 +28769,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" +config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -28687,6 +28799,9 @@ $config_files Configuration headers: $config_headers +Configuration links: +$config_links + Configuration commands: $config_commands @@ -28822,6 +28937,7 @@ do "as") CONFIG_FILES="$CONFIG_FILES as:exec-tool.in" ;; "collect-ld") CONFIG_FILES="$CONFIG_FILES collect-ld:exec-tool.in" ;; "nm") CONFIG_FILES="$CONFIG_FILES nm:exec-tool.in" ;; + "clearcap.map") CONFIG_LINKS="$CONFIG_LINKS clearcap.map:${srcdir}/config/$clearcap_map" ;; "$all_outputs") CONFIG_FILES="$CONFIG_FILES $all_outputs" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -28837,6 +28953,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -29158,7 +29275,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -29394,7 +29511,38 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} || as_fn_error "could not create -" "$LINENO" 5 fi ;; + :L) + # + # CONFIG_LINK + # + + if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then + : + else + # Prefer the file from the source tree if names are identical. + if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then + ac_source=$srcdir/$ac_source + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error "$ac_source: file not found" "$LINENO" 5 + fi + rm -f "$ac_file" + + # Try a relative symlink, then a hard link, then a copy. + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || + as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; |