[patch,libgomp] Make libgomp Fortran modules multilib-aware

[Jakub Jelinek]

On Tue, May 31, 2016 at 03:36:14PM +0200, FX wrote:
> Richard, Jakub, or any global write maintainer: can I get a review on this one-word patch?
> 
> ------------------
> 
> The attached patch allows libgomp to install its Fortran modules in the correct multilib-aware directories, just like libgfortran does.
> Without it, multilib Fortran OpenMP code using the modules fails to compile because the modules are not found:
> 
> $ gfortran -fopenmp a.f90 
> $ gfortran -fopenmp a.f90 -m32
> a.f90:1:6:
> 
>   use omp_lib
>      1
> Fatal Error: Can't open module file ‘omp_lib.mod’ for reading at (1): No such file or directory
> compilation terminated.

Why?  It should look for it first in 32/finclude, sure, but if not found,
should fall back to finclude dir, where it is found.
Does it differ between 32-bit and 64-bit compilation?

> Bootstrapped and tested on x86_64-apple-darwin15. OK to commit?

> 2016-05-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
> 
> 	PR libgomp/60670
> 	* Makefile.am: Make fincludedir multilib-aware.
> 	* Makefile.in: Regenerate.

> Index: libgomp/Makefile.am
> ===================================================================
> --- libgomp/Makefile.am	(revision 235843)
> +++ libgomp/Makefile.am	(working copy)
> @@ -10,7 +10,7 @@ config_path = @config_path@
>  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
>  	      $(top_srcdir)/../include
>  
> -fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
> +fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
>  libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
>  
>  vpath % $(strip $(search_path))


	Jakub