diff mbox

[libgomp] Make libgomp Fortran modules multilib-aware

Message ID 929E41CA-3ADF-4C09-90D5-CD13660F5E35@gmail.com
State New
Headers show

Commit Message

FX Coudert Jan. 9, 2017, 10:04 a.m. UTC 
Given lack of review of this Fortran-specific patch for libgomp, can a Fortran maintainer approve it please?

FX

> *ping*
> 
> This patch from May makes libgomp install its Fortran modules in the correct multilib-aware directories, following what libgfortran does.
> 
> 
> 
> 
>> 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.
>> 
>> 
>> 
>> Bootstrapped and tested on x86_64-apple-darwin15. OK to commit?
>> 
>> FX
>> 
>> 
>> 
>> 
>> 
>> 
>> 2016-05-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
>> 
>> 	PR libgomp/60670
>> 	* Makefile.am: Make fincludedir multilib-aware.
>> 	* Makefile.in: Regenerate.

Comments

Mike Stump Jan. 9, 2017, 6:49 p.m. UTC | #1 
On Jan 9, 2017, at 2:04 AM, FX <fxcoudert@gmail.com> wrote:
> 
> Given lack of review of this Fortran-specific patch for libgomp, can a Fortran maintainer approve it please?

Ok.
diff mbox

Patch

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))