diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-03-21 10:57:51 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-03-21 10:57:51 +0000 |
| commit | 8fbc58a113676ee2546328b3e031f29940667210 (patch) | |
| tree | 5d4112b947545fb355a9d7e6557e93a8a9e98b23 /gcc | |
| parent | 7e84ad0b41b8deb0f834695bfece17ac1971f389 (diff) | |
| download | gcc-8fbc58a113676ee2546328b3e031f29940667210.zip gcc-8fbc58a113676ee2546328b3e031f29940667210.tar.gz gcc-8fbc58a113676ee2546328b3e031f29940667210.tar.bz2 | |
configure.ac (gcc_cv_lto_plugin): Fix typo.
* configure.ac (gcc_cv_lto_plugin): Fix typo.
Allow -fuse-linker-plugin for non-default plugin linker.
* configure: Regenerate.
From-SVN: r171215
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 8 | ||||
| -rw-r--r-- | gcc/configure.ac | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e5ea078..030c32f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-03-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (gcc_cv_lto_plugin): Fix typo. + Allow -fuse-linker-plugin for non-default plugin linker. + * configure: Regenerate. + 2011-03-21 Nicola Pero <nicola.pero@meta-innovation.com> PR bootstrap/48167 diff --git a/gcc/configure b/gcc/configure index a2f78c3..23fa913 100755 --- a/gcc/configure +++ b/gcc/configure @@ -23134,14 +23134,14 @@ fi $as_echo_n "checking linker plugin support... " >&6; } gcc_cv_lto_plugin=0 if test -f liblto_plugin.la; then - if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET=" = x"$gcc_cv_ld"; then + if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" = x"$gcc_cv_ld"; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then gcc_cv_lto_plugin=2 elif test "$ld_is_gold" = yes -a "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -eq 20; then gcc_cv_lto_plugin=1 fi - elif echo "$ld_ver" | grep GNU > /dev/null; then + elif test x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" = x"$gcc_cv_ld" && echo "$ld_ver" | grep GNU > /dev/null; then # Require GNU ld or gold 2.21+ for plugin support by default. if test "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -ge 21; then gcc_cv_lto_plugin=2 @@ -23149,6 +23149,10 @@ if test -f liblto_plugin.la; then elif test "$ld_is_gold" = yes -a "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -eq 20; then gcc_cv_lto_plugin=1 fi + elif test x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" != x"$gcc_cv_ld"; then + # Allow -fuse-linker-plugin if plugin linker differs from + # default/specified linker. + gcc_cv_lto_plugin=1 fi fi diff --git a/gcc/configure.ac b/gcc/configure.ac index 2e83b2d..adca466 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -3192,14 +3192,14 @@ fi AC_MSG_CHECKING(linker plugin support) gcc_cv_lto_plugin=0 if test -f liblto_plugin.la; then - if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET=" = x"$gcc_cv_ld"; then + if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" = x"$gcc_cv_ld"; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then gcc_cv_lto_plugin=2 elif test "$ld_is_gold" = yes -a "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -eq 20; then gcc_cv_lto_plugin=1 fi - elif echo "$ld_ver" | grep GNU > /dev/null; then + elif test x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" = x"$gcc_cv_ld" && echo "$ld_ver" | grep GNU > /dev/null; then # Require GNU ld or gold 2.21+ for plugin support by default. if test "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -ge 21; then gcc_cv_lto_plugin=2 @@ -3207,6 +3207,10 @@ if test -f liblto_plugin.la; then elif test "$ld_is_gold" = yes -a "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -eq 20; then gcc_cv_lto_plugin=1 fi + elif test x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" != x"$gcc_cv_ld"; then + # Allow -fuse-linker-plugin if plugin linker differs from + # default/specified linker. + gcc_cv_lto_plugin=1 fi fi AC_DEFINE_UNQUOTED(HAVE_LTO_PLUGIN, $gcc_cv_lto_plugin, |