From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id 3890B3858D1E for ; Fri, 23 Dec 2022 20:30:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3890B3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 2348010047D9D for ; Fri, 23 Dec 2022 20:30:01 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 8og4pJrtFSbI38og4piWvp; Fri, 23 Dec 2022 20:30:01 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=TfpTCTch c=1 sm=1 tr=0 ts=63a60fc9 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=CCpqsmhAAAAA:8 a=R8UYyBDJFoXeBrIsApkA:9 a=ul9cdbp4aOFLsgKbc677:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3uSLw0aOeRKBG+E+QlWhB+bz0IipuEH1k0ce2BP7Mdg=; b=ruyrxl6SMUdfIIZkA3BRaR5BBV Ivbjcb26k6JIwHuO6WoCHtsSLJn90MwodcB9Yhva7F1MCTwjqGuSEuvkwbIlR50rEgDuNWgUdPWJM 38hMZQJuBT0qht0xFyHt9XrdJ; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:40826 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p8og4-001oN9-Os; Fri, 23 Dec 2022 13:30:00 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Fix 'make TAGS' in gdbserver Date: Fri, 23 Dec 2022 13:29:49 -0700 Message-Id: <20221223202949.607009-1-tom@tromey.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1p8og4-001oN9-Os X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:40826 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: PR build/29003 points out that "make TAGS" is broken in gdbserver. This patch fixes the problem that is pointed out there, plus another one I noticed while working on that -- namely that the "sed" computes the wrong names for some source files. Finally, a couple of obsolete variable references are removed. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29003 --- gdbserver/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 8462d78a859..54eaff4394f 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -235,7 +235,7 @@ DEPFILES = @GDBSERVER_DEPFILES@ LIBOBJS = @LIBOBJS@ SOURCES = $(SFILES) -TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} +TAGFILES = $(SOURCES) OBS = \ alloc.o \ @@ -398,8 +398,9 @@ TAGS: ${TAGFILES} etags \ `for i in yzzy ${DEPFILES}; do \ if [ x$$i != xyzzy ]; then \ - echo ${srcdir}/$$i | sed -e 's/\.o$$/\.cc/' \ - -e 's,/\(arch\|nat\|target\)/,/../\1/,' \ + echo ${srcdir}/$$i | \ + sed -e 's,/\(\(arch\|nat\|target\)/.*\)\.o$$,/../gdb/\1.c,' \ + -e 's/\.o$$/\.cc/'; \ fi; \ done` \ ${TAGFILES} -- 2.38.1