From patchwork Mon Jan 13 18:58:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 37356 Received: (qmail 99074 invoked by alias); 13 Jan 2020 18:58:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 99066 invoked by uid 89); 13 Jan 2020 18:58:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.142.138) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2020 18:58:44 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id E86E46961E1 for ; Mon, 13 Jan 2020 13:58:42 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id tbyo0Xc4uDoP; Mon, 13 Jan 2020 13:58:42 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 5FAAC6961DB; Mon, 13 Jan 2020 13:58:42 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 5FAAC6961DB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1578941922; bh=ikkCHVo6gbGQnhzpi3ZaXOn0CgXuHG14Nr0oVJZzEGQ=; h=From:To:Date:Message-Id:MIME-Version; b=PK/OvDr4wu1bLCtliySgyViKW+W/Dj3J3Zq4GcFhR8r6S2Wov8px1Vqej4Tz1sm9S d9Vol4FoK2psaKqn8q2KIvYImyvGUwt1xyVF086BqILptjJxeZsZ0Mt6oorfyJC68t hNjWqPuArI9QN19XxV59olZnJ+l3hn+Yjq13hVaoD0BBWVPUGGTXFMZkbJ8vfzzhBg JRGM1p+Iq3nxyg55ktsGzaxZqz/eb4U4NqPBGzXfZX9hgMjZNIYVLPLqNbfw6iCn9L lHw5jziO5kERdfsQGB/nTCIvjb/aZlgePmrrepp10qayFDIbdmUeokUfPEaYugIv8Q zPkf/YAcIXw4Q== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id oepFR6GK3nQo; Mon, 13 Jan 2020 13:58:42 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by mail.efficios.com (Postfix) with ESMTPSA id 3CBDA6961D4; Mon, 13 Jan 2020 13:58:42 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gdbserver: fix Makefile dependency of regformat-generated files on regdat.sh Date: Mon, 13 Jan 2020 13:58:40 -0500 Message-Id: <20200113185840.30553-1-simon.marchi@efficios.com> MIME-Version: 1.0 The intent of the rules modified by this patch is that the *-generated.c files generated by regdat.sh are re-generated in the event that regdat.sh is modified. However, if I build, touch regdat.sh, and build again, the files are not re-generated during the second build. This is because regdat.sh is specified as an order-only dependency [1], after the pipe. Make therefore only ensures that regdat.sh exists before generating the target file, it doesn't check the timestamp of regdat.sh. This patch changes it to be a regular prerequisite. The rules use the $< variable, which is substituted by the first prerequisite only, so the command lines won't change. [1] https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html gdb/gdbserver/ChangeLog: * Makefile.in (%-generated.c): Make $(regdat_sh) a regular prerequisite. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/Makefile.in | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 67d39beba5b8..730c53a2e830 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-01-13 Simon Marchi + + * Makefile.in (%-generated.c): Make $(regdat_sh) a regular + prerequisite. + 2020-01-12 Simon Marchi * linux-arm-tdesc.c: Include linux-arm-tdesc.h. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 1125426778b8..fd43e407b8a3 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -648,16 +648,16 @@ gdbsupport/%.o: ../gdbsupport/%.c # Rules for register format descriptions. Suffix destination files with # -generated to identify and clean them easily. -%-generated.c: ../regformats/%.dat | $(regdat_sh) +%-generated.c: ../regformats/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ -%-generated.c: ../regformats/arm/%.dat | $(regdat_sh) +%-generated.c: ../regformats/arm/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ -%-generated.c: ../regformats/i386/%.dat | $(regdat_sh) +%-generated.c: ../regformats/i386/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ -%-generated.c: ../regformats/rs6000/%.dat | $(regdat_sh) +%-generated.c: ../regformats/rs6000/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ #