LTO: consistently accept -fwhopr* and -flto* for GCC.

* libltdl/config/ltmain.m4sh (func_mode_link): Accept -fwhopr*.
* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Also match
-flto*.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 3819e0bf558f4677e62403bd09ca64f81a39b7e7..e6decf2c03081c731a110d1293b5c8e15010358b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       LTO: consistently accept -fwhopr* and -flto* for GCC.
+       * libltdl/config/ltmain.m4sh (func_mode_link): Accept -fwhopr*.
+       * libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Also match
+       -flto*.
+
 2010-09-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        tests: avoid spurious test failure due to library mode on HP-UX.

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 5ada0c1b1fcae129331cd4b6d75ee02013f9fab9..d74b59898e355f68d5be000ac280843d0542b408 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5014,10 +5014,10 @@ func_mode_link ()
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr, -fuse-linker-plugin GCC link-time optimization
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr|-fuse-linker-plugin)
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
         func_quote_for_eval "$arg"
        arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 01cd66a80f0e4681ba7fa551345a8e160801fd14..c2803cdb91b32f50216d88fa9233a9a2f7e63157 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6836,7 +6836,7 @@ _LT_EOF
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
-*\ -flto\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
 esac