From patchwork Mon Dec 26 11:25:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: FX Coudert X-Patchwork-Id: 708774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tnGry67qFz9sD6 for ; Mon, 26 Dec 2016 22:25:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="HTLel6X+"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :message-id:content-type:mime-version:subject:date:in-reply-to :cc:to:references; q=dns; s=default; b=kTmEKCXWf+l7LhKu8qblxCIV1 Z2/X0rs3G7D26ZNWt1HHASBO52al6jhlOuLeM6MemtZdpAcITARb1fdfYGCzsZGA xOB5mpEh6obas6I5S6CrDZ6B4NvV9Hr58JR6D0KXSl0fkkmVfy7GutlEvRV1f3DN sLxY3nUsxH8yxd+80E= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :message-id:content-type:mime-version:subject:date:in-reply-to :cc:to:references; s=default; bh=xEj2Od4qX2G7/u2pb2S+9QLhHHs=; b= HTLel6X+MeVfz3bEMCQ0+Hbl3hcLm3GheULZpc8RiIbrhkhC8UgBBLWZFEoVKaQZ +3TtjPOITQb2mUzQyzIiR3T3RrtPlYfpS1dTRdia2tJkP6+Pmzxn2K/tCti7CeH4 HG7viAptQ/w004457/E05A+7UuqENfEEDPBQ03+In6Y= Received: (qmail 65552 invoked by alias); 26 Dec 2016 11:25:44 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 65543 invoked by uid 89); 26 Dec 2016 11:25:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=fxcoudertgccgnuorg, fxcoudert@gcc.gnu.org, HX-Received:Mon, Fatal X-HELO: mail-wj0-f196.google.com Received: from mail-wj0-f196.google.com (HELO mail-wj0-f196.google.com) (209.85.210.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Dec 2016 11:25:33 +0000 Received: by mail-wj0-f196.google.com with SMTP id kp2so48180101wjc.0 for ; Mon, 26 Dec 2016 03:25:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=lBAx2t7Vhhi0mE4dX5cSIRKdzP1qegLU86biE25V6rw=; b=X0XbKuGjqb9oRrdaZa8g6TFtTEcZL/OzLma7aDdHyM4yCPGAT64f9wRK/XxTzds03t qqkO5XfNfNmLIuuioiZ44EeSAN+euvEfx62XsG16DCEEU0GQMAq2Mv4eRYPocmCJXna4 9HUfEd1EWXdjBr0usrqFky1tMBChNzsyzj41kdDg+olmdbbrCoo7wuUrgrSqkMhwGL5v MBe+jI8+3s8vqwtouKzXOih6tNBRE3oNejabE+i2eCoswQ+YqG/4rqY/Z5aFMq/tc46b 8Ds1UcrKlQXzMW9rjuG9t4txXgMTVtAdPhEiQkZ2viS7lr9xorXaFtH2pQxo/lA6wvHR eW4A== X-Gm-Message-State: AIkVDXLuE5f3s8Ddpiq8fjxWRlnH3E5LKFmybJ8UpNUvmhiY/Qgj/CoSIMTn1bdw2qqoQw== X-Received: by 10.194.53.227 with SMTP id e3mr22669933wjp.225.1482751531225; Mon, 26 Dec 2016 03:25:31 -0800 (PST) Received: from [192.168.0.107] (95-210-222-144.ip.skylogicnet.com. [95.210.222.144]) by smtp.gmail.com with ESMTPSA id l67sm50815366wmf.20.2016.12.26.03.25.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Dec 2016 03:25:30 -0800 (PST) From: FX Message-Id: <765E0C1E-597F-427F-909A-1DD909512431@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\)) Subject: Re: [patch,libgomp] Make libgomp Fortran modules multilib-aware Date: Mon, 26 Dec 2016 12:25:16 +0100 In-Reply-To: Cc: Jack Howarth , Richard Henderson , Jakub Jelinek To: GCC Patches References: <4795FF84-EC6B-448F-991E-AAA8948D5EE4@gmail.com> <93D9F5BF-2BFD-4DC9-957E-EB3CAA41E7D9@gmail.com> *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 > > 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))