From: Justin Lecher <jlec@gentoo.org>
Date: Mon, 14 Mar 2011 07:40:50 +0000 (+0100)
Subject: Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.
X-Git-Tag: v2.4.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b76054f4763a28ae1b01fbeee86ba0c524d1923;p=thirdparty%2Flibtool.git

Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.

If -fopenmp if passed to gcc during linking, it will take care to add all
necessary libs to link correctly for openmp support. Currently libtool filters
those flags, similar as it was the case with the threading flags. This change
handles the situation for the openmp support similar as before the thread
support was fixed.

http://lists.gnu.org/archive/html/bug-libtool/2010-12/msg00009.html
http://lists.gnu.org/archive/html/bug-libtool/2011-03/msg00014.html

* libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP
flags like pthreads flags.

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

diff --git a/ChangeLog b/ChangeLog
index 4ed09a39c..bc7c2afc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-22  Justin Lecher  <jlec@gentoo.org>  (tiny change)
+	    Rhys Ulerich  <rhys.ulerich@gmail.com>  (tiny change)
+
+	Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.
+	* libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP
+	flags like pthreads flags.
+
 2011-03-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	libtoolize: detect -I<dir> (without space) in ACLOCAL_AMFLAGS.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 766777fe2..9358ec5e8 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4865,7 +4865,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -5369,7 +5370,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"