From patchwork Fri Oct 17 15:51:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 400559 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 EEC3B14009A for ; Sat, 18 Oct 2014 02:51:36 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=WZaiEt8xEyMQs2sezOpVp1kQeFpRPbAf0AGU+Q2EHc1f6vblJq53x 1lB4C20EX9qsK8pKHRQ66L5ifsdyRioowOnelz+l6OkVq6alsjI3qrhkRM3zLvrU HQPciHFn0CM+bmB9b0434T2JBg9G0W9GDK9u3KxEWN2ni/JVQs7Kh0= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=eiDv7s4FKwZRlMzuBNzUpM4PvhI=; b=TdguL+hZGo7jMiReEBy9 1w3MCYc/c0JCpUaYfKlR9dyfmB3nt72m05mB3BNIrN97pCwoefvEvxFg+KKvbMuV 9oP7MaUWHWQ76LYpVKAcyQouupD58uLL8KKWOxi3XP7FvGnrTqDASY03HUY6Pij5 8uKwrLuBqWZlmMV7EM59tnM= Received: (qmail 10899 invoked by alias); 17 Oct 2014 15:51:30 -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 10888 invoked by uid 89); 17 Oct 2014 15:51:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Oct 2014 15:51:28 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Xf9oL-0004ml-G0 from Julian_Brown@mentor.com for gcc-patches@gcc.gnu.org; Fri, 17 Oct 2014 08:51:25 -0700 Received: from octopus (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.181.6; Fri, 17 Oct 2014 16:51:24 +0100 Date: Fri, 17 Oct 2014 16:51:17 +0100 From: Julian Brown To: , Subject: [gomp4] Fix include path configury for gomp-constants.h Message-ID: <20141017165117.03bccb6c@octopus> MIME-Version: 1.0 X-IsSubscribed: yes Hi, This patch tweaks the include path configury used by libgomp to find the gomp-constants.h header, as suggested by Jakub. OK for the gomp4 branch? Thanks, Julian libgomp/ * Makefile.am (AM_CPPFLAGS): Fix search path for locating gomp-constants.h. * Makefile.in: Regenerate. commit a682a91d68d3ffb1516a1589ef093e00151a6078 Author: Julian Brown Date: Wed Oct 15 02:12:07 2014 -0700 Fix include path configury for gomp-constants.h. diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 7ddb0a4..77f71ee 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -14,8 +14,7 @@ libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include vpath % $(strip $(search_path)) -AM_CPPFLAGS = $(addprefix -I, $(search_path)) \ - $(addprefix -I, $(search_path)/../include) +AM_CPPFLAGS = $(addprefix -I, $(search_path)) -I $(top_srcdir)/../include AM_CFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 4965442..fdd18ff 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -333,9 +333,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include -AM_CPPFLAGS = $(addprefix -I, $(search_path)) \ - $(addprefix -I, $(search_path)/../include) - +AM_CPPFLAGS = $(addprefix -I, $(search_path)) -I $(top_srcdir)/../include AM_CFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) toolexeclib_LTLIBRARIES = libgomp.la $(am__append_1) \