* justin wrote on Mon, Mar 14, 2011 at 08:45:29AM CET: > On 14/03/11 07:24, Ralf Wildenhues wrote: > > > > Care to send a full patch, as per HACKING (in the git source tree) > > and with ChangeLog entry?
> here you are. * Rhys Ulerich wrote on Mon, Mar 14, 2011 at 03:54:09PM CET: > 'Morning, > > Included is a patch to fix an issue where OpenMP flags are discarded by > libtool. > > This has popped up a couple of times. For example, > https://bugzilla.redhat.com/show_bug.cgi?id=679491 > http://lists.gnu.org/archive/html/bug-libtool/2010-12/msg00009.html > http://lists.gnu.org/archive/html/bug-libtool/2011-03/msg00015.html Thanks to both of you, and sorry for my abysmal review speed. I've taken both patches you sent, mixed them together, wrapped long lines, and committed in your name, as follows. The "(tiny change)" just denotes that copyright papers have not been signed. Cheers, Ralf commit 1b76054f4763a28ae1b01fbeee86ba0c524d1923 Author: Justin Lecher <...> Date: Mon Mar 14 08:40:50 2011 +0100 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.wildenh...@gmx.de> diff --git a/ChangeLog b/ChangeLog index 4ed09a3..bc7c2af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-22 Justin Lecher <...> (tiny change) + Rhys Ulerich <...> (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.wildenh...@gmx.de> libtoolize: detect -I<dir> (without space) in ACLOCAL_AMFLAGS. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 766777f..9358ec5 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"
