From patchwork Thu Feb 14 22:16:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 220534 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]) by ozlabs.org (Postfix) with SMTP id C2F272C008C for ; Fri, 15 Feb 2013 09:17:30 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1361485051; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=xXBQTfqz5vMag855D4yNwquBDFs=; b=Sah5Z0r2kgrJh+N KYl1yA+PQ4bLB5MTZb7so1PO5vK9bhvvN9R77AwI3gbnB3N5AZDAFmT+Cz+dFWJt XvN5wOeBbo470x2SjmSP5j4tAYmvQ+rfpeWF3hIjLyp5rH3DJnNy42O9FXoCtXN0 8vH3At6IaVUDTFqWGd/X6NSgEPFk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=j0gKXc3ts1Ti7YbAhhAWTVMLy3H2eIQnTU6/wP4ZSBjABmDQZFSNu64FSG2uaK sMqSdBRcI0gxJAFJL9NRIbGZpaU27R7Iahxulwo68wZcxFUziDCW027YugDXp3/V hjvEiKQ6eR4qktn/q6M6aIuVbJdKqVWfMr3DXKDFN6/Qw=; Received: (qmail 17624 invoked by alias); 14 Feb 2013 22:17:09 -0000 Received: (qmail 17603 invoked by uid 22791); 14 Feb 2013 22:17:07 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_NO, RP_MATCHES_RCVD, TW_CP X-Spam-Check-By: sourceware.org Received: from cc-smtpout1.netcologne.de (HELO cc-smtpout1.netcologne.de) (89.1.8.211) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 14 Feb 2013 22:17:00 +0000 Received: from cc-smtpin2.netcologne.de (cc-smtpin2.netcologne.de [89.1.8.202]) by cc-smtpout1.netcologne.de (Postfix) with ESMTP id 072CA12AB1; Thu, 14 Feb 2013 23:16:58 +0100 (CET) Received: from [192.168.0.104] (xdsl-87-79-199-56.netcologne.de [87.79.199.56]) by cc-smtpin2.netcologne.de (Postfix) with ESMTPSA id 88E0B11DB5; Thu, 14 Feb 2013 23:16:53 +0100 (CET) Message-ID: <511D6254.8060601@netcologne.de> Date: Thu, 14 Feb 2013 23:16:52 +0100 From: Thomas Koenig User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130105 Thunderbird/17.0.2 MIME-Version: 1.0 To: Tobias Burnus CC: Paul Richard Thomas , Jakub Jelinek , "fortran@gcc.gnu.org" , gcc-patches Subject: Re: [patch, Fortran] Fix PR 56224 References: <5115649D.4080808@netcologne.de> <5116235A.4040309@net-b.de> <51164BCD.9080101@netcologne.de> <511A1624.4070001@net-b.de> In-Reply-To: <511A1624.4070001@net-b.de> 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 Hi Tobias, > OK. Thanks for the patch after fixing the nit below. Sorry for not noticing the review when you sent it. Here is the patch as I committed it as Revision 196058. 2013-02-14 Thomas Koenig PR fortran/56224 * gfortran.h (gfc_add_include_path): Add boolean argument for warn. * scanner.c (gfc_add_include_path): Pass along warn argument to add_path_to_list. * options.c (gfc_post_options): Add true warn argument to gfc_add_include_path. (gfc_handle_module_path_options): Likewise. (gfc_handle_option): Also gfc_add_include_path for intrinsic modules, without warning. Thanks for the review! Thomas Index: gfortran.h =================================================================== --- gfortran.h (Revision 195922) +++ gfortran.h (Arbeitskopie) @@ -2381,7 +2381,7 @@ match gfc_match_char_spec (gfc_typespec *); void gfc_scanner_done_1 (void); void gfc_scanner_init_1 (void); -void gfc_add_include_path (const char *, bool, bool); +void gfc_add_include_path (const char *, bool, bool, bool); void gfc_add_intrinsic_modules_path (const char *); void gfc_release_include_path (void); FILE *gfc_open_included_file (const char *, bool, bool); Index: options.c =================================================================== --- options.c (Revision 195922) +++ options.c (Arbeitskopie) @@ -337,10 +337,10 @@ gfc_post_options (const char **pfilename) source_path = (char *) alloca (i + 1); memcpy (source_path, canon_source_file, i); source_path[i] = 0; - gfc_add_include_path (source_path, true, true); + gfc_add_include_path (source_path, true, true, true); } else - gfc_add_include_path (".", true, true); + gfc_add_include_path (".", true, true, true); if (canon_source_file != gfc_source_file) free (CONST_CAST (char *, canon_source_file)); @@ -498,7 +498,7 @@ gfc_handle_module_path_options (const char *arg) gfc_option.module_dir = XCNEWVEC (char, strlen (arg) + 2); strcpy (gfc_option.module_dir, arg); - gfc_add_include_path (gfc_option.module_dir, true, false); + gfc_add_include_path (gfc_option.module_dir, true, false, true); strcat (gfc_option.module_dir, "/"); } @@ -844,6 +844,13 @@ gfc_handle_option (size_t scode, const char *arg, case OPT_fintrinsic_modules_path: case OPT_fintrinsic_modules_path_: + + /* This is needed because omp_lib.h is in a directory together + with intrinsic modules. Do no warn because during testing + without an installed compiler, we would get lots of bogus + warnings for a missing include directory. */ + gfc_add_include_path (arg, false, false, false); + gfc_add_intrinsic_modules_path (arg); break; @@ -978,7 +985,7 @@ gfc_handle_option (size_t scode, const char *arg, break; case OPT_I: - gfc_add_include_path (arg, true, false); + gfc_add_include_path (arg, true, false, true); break; case OPT_J: Index: scanner.c =================================================================== --- scanner.c (Revision 195922) +++ scanner.c (Arbeitskopie) @@ -375,9 +375,10 @@ add_path_to_list (gfc_directorylist **list, const void -gfc_add_include_path (const char *path, bool use_for_modules, bool file_dir) +gfc_add_include_path (const char *path, bool use_for_modules, bool file_dir, + bool warn) { - add_path_to_list (&include_dirs, path, use_for_modules, file_dir, true); + add_path_to_list (&include_dirs, path, use_for_modules, file_dir, warn); /* For '#include "..."' these directories are automatically searched. */ if (!file_dir)