From patchwork Thu Feb 13 04:30:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1237264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-519451-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=fqvXbnkX; dkim-atps=neutral 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 48J3Vz6TmYz9s29 for ; Thu, 13 Feb 2020 15:31:37 +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:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=Ds73lV711/X4GAVR4PHfnaYrqaEFbPbXsf4N7G+0UXledOBoHk 8fHRDfif7rAJjWN2qgIW141TUV/Qv9v2vhWV+yyOrrPDzp1t2EkgTuB05TmN2fvt g30CtSj/dg5YIi1x/u4Q2sEsPCQMSnZiNsPW2PR9txr7QDvEVEiY7QKiA= 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 :to:cc:subject:date:message-id:mime-version:content-type; s= default; bh=/xDWCvY0UCVDN+Pn4YTu4LngV5o=; b=fqvXbnkX6NOmknDeN8vP 0oOhusSTJU+YaK5EJZfVPPcbsMZLdy/rIrp9BvwZtS6i2VDbZFhQrxUrvxF1pgqP yok+MfAH05s52+NhvWFxYyQGAAeEyVk0wcGoiLOdPje3Pay0YGcdTz0m+ZOxQP1K YUz7ZKt4/6acFlPvEBgYM8g= Received: (qmail 21983 invoked by alias); 13 Feb 2020 04:31:29 -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 21921 invoked by uid 89); 13 Feb 2020 04:31:21 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=freedom, amend, stallman, include-fixed X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 13 Feb 2020 04:31:19 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 9FD9356026; Wed, 12 Feb 2020 23:31:05 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id tdoERyaKQsD4; Wed, 12 Feb 2020 23:31:05 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 5EE6156025; Wed, 12 Feb 2020 23:31:05 -0500 (EST) Received: from livre.home (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 01D4UtNU065022 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Feb 2020 01:30:56 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Bruce Korb Subject: [fixincludes] skip fixinc on vxworks7*, amend mkheaders Date: Thu, 13 Feb 2020 01:30:55 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 vxworks7 headers haven't required fixes, and we've long avoided running fixinc on them. The problem with that is that, with a dummy fixinc, mkheaders wipes out include-fixed but then multi_dir subdirs are not created again, so we end up with a limits.h named after each multi_dir, when there are non-default multilibs. Oops. This patch arranges for a dummy fixinc to be created for *-*-vxworks7* targets, and fixes mkheaders so as to create multi_dir subdirs in include-fixed after wiping them out, and to copy limits.h so that it won't take the name that should be of a subdir (unless the multi_dir is limits.h, but that's hopefully never the case ;-) This was tested on x86_64-linux-gnu (no changes to include-fixed there, as expected), and with various of AdaCore's vx6 and vx7 targets, including ones with and without multilibs. Ok to install? for fixincludes/ChangeLog * mkheaders.in: Re-create subdirs, copy limits.h into subdir. * mkfixinc.sh: Create dummy fixinc for *-*-vxworks7*. --- fixincludes/mkfixinc.sh | 1 + fixincludes/mkheaders.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh index 0f96486..df90720 100755 --- a/fixincludes/mkfixinc.sh +++ b/fixincludes/mkfixinc.sh @@ -19,6 +19,7 @@ case $machine in powerpc-*-rtems* | \ powerpcle-*-eabisim* | \ powerpcle-*-eabi* | \ + *-*-vxworks7* | \ *-musl* ) # IF there is no include fixing, # THEN create a no-op fixer and exit diff --git a/fixincludes/mkheaders.in b/fixincludes/mkheaders.in index 9109b05..a293a57 100644 --- a/fixincludes/mkheaders.in +++ b/fixincludes/mkheaders.in @@ -86,6 +86,7 @@ for ml in `cat ${itoolsdatadir}/fixinc_list`; do sysroot_headers_suffix=`echo ${ml} | sed -e 's/;.*$//'` multi_dir=`echo ${ml} | sed -e 's/^[^;]*;//'` subincdir=${incdir}${multi_dir} + ${mkinstalldirs} ${subincdir} . ${itoolsdatadir}/mkheaders.conf if [ x${STMP_FIXINC} != x ] ; then TARGET_MACHINE="${target}" target_canonical="${target}" \ @@ -100,5 +101,5 @@ for ml in `cat ${itoolsdatadir}/fixinc_list`; do fi fi - cp ${itoolsdatadir}/include${multi_dir}/limits.h ${subincdir} + cp ${itoolsdatadir}/include${multi_dir}/limits.h ${subincdir}/limits.h done