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/lto-plugin | |
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/lto-plugin')
-rw-r--r-- | gcc-4.9/lto-plugin/ChangeLog | 6 | ||||
-rwxr-xr-x | gcc-4.9/lto-plugin/configure | 47 | ||||
-rw-r--r-- | gcc-4.9/lto-plugin/configure.ac | 14 |
3 files changed, 62 insertions, 5 deletions
diff --git a/gcc-4.9/lto-plugin/ChangeLog b/gcc-4.9/lto-plugin/ChangeLog index af21cf827..6dfaee2a9 100644 --- a/gcc-4.9/lto-plugin/ChangeLog +++ b/gcc-4.9/lto-plugin/ChangeLog @@ -1,3 +1,9 @@ +2014-05-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR lto/60981 + * configure.ac: Check for -static-libgcc. + * configure: Regenerate. + 2014-04-22 Release Manager * GCC 4.9.0 released. diff --git a/gcc-4.9/lto-plugin/configure b/gcc-4.9/lto-plugin/configure index 2fc838329..efe9970a4 100755 --- a/gcc-4.9/lto-plugin/configure +++ b/gcc-4.9/lto-plugin/configure @@ -4087,8 +4087,32 @@ fi done CFLAGS="$save_CFLAGS" + +# Check whether -static-libgcc is supported. +saved_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -static-libgcc" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -static-libgcc" >&5 +$as_echo_n "checking for -static-libgcc... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + int main() {} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_static_libgcc=yes +else + have_static_libgcc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_static_libgcc" >&5 +$as_echo "$have_static_libgcc" >&6; }; +LDFLAGS="$saved_LDFLAGS" # Need -Wc to get it through libtool. -if test "x$GCC" = xyes; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi +if test "x$have_static_libgcc" = xyes; then + ac_lto_plugin_ldflags="-Wc,-static-libgcc" +fi + case `pwd` in *\ * | *\ *) @@ -7163,7 +7187,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 @@ -10562,7 +10601,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10565 "configure" +#line 10604 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10668,7 +10707,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10671 "configure" +#line 10710 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc-4.9/lto-plugin/configure.ac b/gcc-4.9/lto-plugin/configure.ac index 4003ae61b..a5f1774df 100644 --- a/gcc-4.9/lto-plugin/configure.ac +++ b/gcc-4.9/lto-plugin/configure.ac @@ -7,9 +7,21 @@ AM_MAINTAINER_MODE AC_PROG_CC AC_SYS_LARGEFILE ACX_PROG_CC_WARNING_OPTS([-Wall], [ac_lto_plugin_warn_cflags]) + +# Check whether -static-libgcc is supported. +saved_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -static-libgcc" +AC_MSG_CHECKING([for -static-libgcc]) +AC_LINK_IFELSE([ + int main() {}], [have_static_libgcc=yes], [have_static_libgcc=no]) +AC_MSG_RESULT($have_static_libgcc); +LDFLAGS="$saved_LDFLAGS" # Need -Wc to get it through libtool. -if test "x$GCC" = xyes; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi +if test "x$have_static_libgcc" = xyes; then + ac_lto_plugin_ldflags="-Wc,-static-libgcc" +fi AC_SUBST(ac_lto_plugin_ldflags) + AM_PROG_LIBTOOL ACX_LT_HOST_FLAGS AC_SUBST(target_noncanonical) |