Message ID | 1524105605-24322-1-git-send-email-simon.marchi@ericsson.com |
---|---|
State | New, archived |
Headers |
Received: (qmail 46063 invoked by alias); 19 Apr 2018 02:40:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 46044 invoked by uid 89); 19 Apr 2018 02:40:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=po, smoke X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Apr 2018 02:40:25 +0000 Received: from ESESSHC008.ericsson.se (Unknown_Domain [153.88.183.42]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 0C.37.13667.59108DA5; Thu, 19 Apr 2018 04:40:22 +0200 (CEST) Received: from ESESSMR503.ericsson.se (153.88.183.112) by ESESSHC008.ericsson.se (153.88.183.42) with Microsoft SMTP Server (TLS) id 14.3.382.0; Thu, 19 Apr 2018 04:40:21 +0200 Received: from ESESSMB502.ericsson.se (153.88.183.163) by ESESSMR503.ericsson.se (153.88.183.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Thu, 19 Apr 2018 04:40:21 +0200 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Thu, 19 Apr 2018 04:40:21 +0200 Received: from elxacz23q12.ericsson.se (129.192.64.65) by MW2PR1501MB2012.namprd15.prod.outlook.com (2603:10b6:302:c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.14; Thu, 19 Apr 2018 02:40:18 +0000 From: Simon Marchi <simon.marchi@ericsson.com> To: <gdb-patches@sourceware.org> CC: Simon Marchi <simon.marchi@ericsson.com> Subject: [PATCH] Fix dependency tracking in gdbserver subdirectories Date: Wed, 18 Apr 2018 22:40:05 -0400 Message-ID: <1524105605-24322-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: YQBPR0101CA0008.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00::21) To MW2PR1501MB2012.namprd15.prod.outlook.com (2603:10b6:302:c::12) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:MW2PR1501MB2012; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2012; 3:U5qgaKncJng3H/0bJUsks29hWsW8VuohmfbWl/wFvB2irM8DEliYoQsmEt3GOUc0J3ykzmOB88BUAjwZJWUiAOx9yrthUQQGSvFxuhFnrpRinfauYw48N7pT86fGxSvZMiZSPJ39d4wJQ1+MlBWR7HoIPNGqvLBKgRNluwlUefqpaLttamoQQqlnZuoX1+E3N6ZU4l1ftO5AaA9WzsRk7Pkw4iZXEmam5uOfhidllAaP3y4h8MQYI+k4KlfIfVBF; 25:Trh4Z0soYK6razFgGrUKU1rFmaFXSlZSB+YyofCtqo46MtEu1nr0tIVBcWV92/0qk/pSgiM9Cln+CPofQBS5nXnlJ+YkuK8cQQlsV0HPrtL/nAnZzqWn3BK5rqFqdYWSVNNWmkFKWi2CVkf8kooxjc0vRQ9tQ2vVi4LzanNIYhZSpnOsbc7ee+98k2HfHrKvByq9kLHuVrsL2ghrNy0Sr20cVU3zTsTFENmNVFLeePhziwS6Jv/WlXVVWD1aVUS/ENX/v4aQYfTlDrlTlmiDm2IDAMAgUmOcULkIOkmTHoVGRdsLcizkJ2ZuM2y8s9AOfcJ+9WKgJ7QR/aoSDOiZ7A==; 31:Mle7PuSgPzQMhnLFmPSEhJ302YdeokGctQanLMB1jcoJIeNJl7zKA1YOnvWC4ObqF+S7EaqPMNEbxjRJaUusozSJPPyqJjZGnf79Jr8Ch+iCjm11tLvMikPJH4urfAhb0F2ePIW+I9O2ym9SY/bQ2f1wXERDpxo9t7cxrqMcldSOyJH3CUTZaQUc1N/TZGHIDbVj3Ztyym/xGjQciGdb6X5pB8UfNihovybeTRKwYQ4= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2012: Authentication-Results: outbound.protection.outlook.com; spf=skipped (originating message); dkim=none (message not signed) header.d=none; dmarc=none action=none header.from=ericsson.com; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2012; 20:YI+uOmHgnEYnu/6zhvq2P6hIM1v6vk+a2hLa5u1tWDgT49PDGl9xp4ps1ohUG7iO8vQ2bfhDQZdqrXbaoHDxyaj/2iwri30/QupNS6ZZ9auMRResGPo5i7rmXpITB/RhtFmG6O4FSSCRe8h7byM7v3GQBvsDK5K7eV+k+f9/dN7VVO5NI2flfmjUrPCO0OjuF0YOGmdN3PcybkioeulW7zClZyV9ul/GDPUUag2rGIdWmb28DrLflKlqpl0Ud/Kr698vIItuvJMcFnHfwMyiujLJgqC8oyhk0rfHdat7Vj1bhPd770l9jGbMvceA+WsKfLUqWtbyyOWDEe67vMS7Ani5m6wCSmjiuw7HDUghwf8TZrOBOrIfc733/Fgl2/5bvO5eugN0leNVB4kn8pBoACH0dfssCz7vUPhHppFjMMNuWBtHhSHO7ifx5taEBWuqyd9TJ3g0u/cwXmEgO+PQxDh6r/pMxcjgRVUS2D4fSSqGesAgVjlKLKrWs88b3RFa; 4:WEArr/5OrZvqMZPq1e4rRwjUDsysG3Tc0w0PTAQH8Xc7lqk+ZVcp83oFggGbc06mivHKVRSW/xN5+9uV2ZgSIA1NEsHfi8LaGY7urmhBYic6UQl54kocXilLkj7SMPOrpPb52yZgQFRe3D9Lwvfp8rtfmbFDlw97eQK/kG9zv+WRyyhiVtzxRIZEZN/8LNbM3ihLmqurotvDE5NJK4ZJ0luR9n+L/Q4QahtTGrKLG4/qMoKOESc8FiHjr8jnPHpUuePv8E1IMe8QZ3FQRXR6fQ== X-Microsoft-Antispam-PRVS: <MW2PR1501MB201281BC9489A422E898F11EEDB50@MW2PR1501MB2012.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231232)(944501373)(52105095)(10201501046)(6041310)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:MW2PR1501MB2012; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2012; X-Forefront-PRVS: 0647963F84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(396003)(39860400002)(366004)(39380400002)(376002)(54534003)(6116002)(316002)(386003)(6506007)(86362001)(44832011)(476003)(956004)(2616005)(36756003)(305945005)(3846002)(5660300001)(16586007)(26005)(478600001)(51416003)(52116002)(6666003)(7736002)(47776003)(6486002)(50466002)(4326008)(16526019)(186003)(1857600001)(53936002)(66066001)(25786009)(2361001)(2906002)(48376002)(6916009)(8676002)(6512007)(53416004)(81166006)(50226002)(8936002)(81156014)(107886003)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2012; H:elxacz23q12.ericsson.se; FPR:; SPF:None; LANG:en; MLV:nov; PTR:InfoNoRecords; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR1501MB2012; 23:qaKF25Pyyr1mzuVLNjCjTml12v7uSodtTPa5B4E?= =?us-ascii?Q?V84I5juSfqU0N5z8nuBhaacaB82chdqwcbKIdXIdeu4n7z2pey7AXmOkAy6E?= =?us-ascii?Q?dDYSkB+2MoZtHXHw1vNy+eiTr7P/GRKtO9YD6WEExojT19p0ERmRM4MeKDSR?= =?us-ascii?Q?vgB5hzyhoXO7iAfpiKH2aRWmOoGYKFilZ1C1ZLFFtLkabaT9M3cNtFOqX784?= =?us-ascii?Q?rzJopdS/ghlKL83jDzM0IZWVa1/VFHrhcfy8GnCLo+wNOdr9bW2/LTUiOzkn?= =?us-ascii?Q?OXHcvVq1fSBzwGZ0ISS9QA+rdluYjrorXjvXgjFRL5NR5nIyw3r74WoS2NPy?= =?us-ascii?Q?yc2VQoKBPltXXU4z+uCUE5r0LbEF0mEZt4bb9x4/FZg9KQTKLtSvNLc4oNS7?= =?us-ascii?Q?7lVGkgI/4RhQznt2Ca377I6ebDpKiqn6cb9qJcDmztacw5MBuvHCmElX9dxM?= =?us-ascii?Q?MCgHdzgX5cjjGwMeHKeAA0DfOfJjGXu1k1SA8fWtBGSRjDLAPdBaoh8x898O?= =?us-ascii?Q?1TFnMh0bUARydodEDbFllzet6BZzDMw57wcoVujRpONNwbnjrXcLW8YUxGoU?= =?us-ascii?Q?BTTFPl403qvp0LfHE0wPfL+QdBFimWRYJWWNzOOheIsk4BQDIIhSFsDmKEW8?= =?us-ascii?Q?qtKJ0I/urBxaaC7iTlgJaHuGI8ro6xoo/hZmE3NM75W3hIf/QF2vWWR20IX5?= =?us-ascii?Q?1sBgUvm1V8zhSOXAUnoM8dk9edpXz2OizSo7n5ZOSQkwd+O9TobGBpMVyBrS?= =?us-ascii?Q?Yu5qCaULl8DX8p2wPT8BvwuoNrBSYaMEC9YwytIW7gRhNqg+nAUstQVHn/9S?= =?us-ascii?Q?YbSNLAd2ai07b8vim7G7ag/L5U8/U7E1TWgff0xfpcphvN2gpplE9hPItbHW?= =?us-ascii?Q?NZcTd2yh8NOqiHwgDRzeJ1U4zaI2HTitG/KnJCYRm+pkiUEgRmAk9gDypc5a?= =?us-ascii?Q?5HWeHy4D5N017WSDKLAAHkiRs+5TiLD0RdiGm/GGL3a+Tua8BxCC8jSvOvp2?= =?us-ascii?Q?HL3/y+txniCteQ8AnnVQlEVZxeNKMO17jpK080re2AnNwJIVokk4wLLngq+f?= =?us-ascii?Q?09w06NIUf3RWj4LoI5MpH6yu41/Gp8zGNcLzUL3TBHe1Oz+kiKybUdbZRkbj?= =?us-ascii?Q?2siNxOmbD6PLMubrYbGLuQPQW1jI0aERw?= X-Microsoft-Antispam-Message-Info: FEqqU5GqZucJXy50wXYhv3bIyLOpPUc+Ad+cPWi5koLD+dkHVbo4ki0jHwzZ5mLE3yfBTNk+EBqFdQ5FnZ6kiTHPB9yfKWS7z+NW6NwgSBqGF5PcT9OsLJVuzX/sCyl1JFeb+s5jJeUPaJXk/4q08REjr1dn5fHzXsSRdHHp+ehPrdwOtrwd91M8H55wU0Q+ X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2012; 6:g7WuC2kf48+Y57lspvSgpZ5Qb5LpN+sGl6d8jA1OgYe9WCo43corC8UhG6ull1N+T9XxqU//mU/gnJh5PoHXUaVpknr9L8h0hIjhAgPCEuiN872HNRSjYeNeXj1/KcX9zt48ipT9JUeT4xtZtLIfDP6PQ6UzjfxCCn9ZCDN7BTScTt5ZagdpyjK2v+wBUeerhNRt/j8BU7WDWI1aDyJSUiMtFApCOWSz81QaclPcT4oeawpxvNghNDYwZsNUXNWer8SSHRToWIJ8u+UHtVc6B45aHzH9f4qDTJpKJM4kA0bDZiEueoeBCVDw+ln0DOr4E8cAtZ3C70jSHieY6FTnOFHHbwnBxYyFfPRYBEQf8IlVxq5v+rvIyrVhNbTu91N+leA8h7lnc9M/dws2mMVFGlZcuoxIxyYubnD2EAf68UnZbDF8ceKqHY8k11MoMXgatNe8ODs+K4MtsWZteeYaVA==; 5:SEp9z3LjQNgPymflhFp09c04s1Ogoi3hZXiD1UA0mIJS1cLYd4cgxfshuqktbIwzeLCetjE1w+rz3/XGGovZEfxosMospGNXomm5NlcG4lTHZRirXogEpcPNq2xm+gAZmKhud8PpcHgKyF3EKNVMu2lYPaudapcxavfWYSNctfU=; 24:9mKeZx83T4aGlYQfoZGdTcELaJ5N1v2XxWIr8UBXKqHtjL8pg6n2p5Y1BkvSH4l2iyQJsIbkdTaEeWKVUv2doZnLpxlpU/N1J1nsrXSTOWk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2012; 7:14AruBUa6xKGwv75esUcOkt1kOXRaWz6Qrj5hw3cxSS6dBtLySE5N4JUbHNyHtbBedwJ44LrBA9PtoAHwdwWVh487r3fK1e2oHzVw1RD5wFBPuw+GjqWdbLKjpgFtkSPktde8sPg8rCgF4jU9IbbbOKevPDMDg8/1P8kcm9xcPPxxvVaO+JodRcfAbHjZzGixG5X7k+5WVu6JwbcMkGigk9n7fqvCvyC0wtNaZ4tHQYOjfL70C0RN1+zW19u3BZO X-MS-Office365-Filtering-Correlation-Id: 69135d27-a88a-4d91-2e96-08d5a59ee3ea X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2018 02:40:18.2015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69135d27-a88a-4d91-2e96-08d5a59ee3ea X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2012 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes |
Commit Message
Simon Marchi
April 19, 2018, 2:40 a.m. UTC
The dependency tracking (the thing that knows which source file included which other source file during last build to know what to rebuild when an included file changes) is broken for gdbserver subdirectories (arch and common). The dependency tracking files are created in the form arch/.deps/i386.Po but we try to include .deps/arch/i386.Po An easy smoke test is too "touch" the gdb/features/i386/32bit-core.c file in the source directory and try to rebuild gdbserver. This file is included by gdb/arch/i386.c, so it should cause gdb/gdbserver/arch/i386.o in the build directory to be rebuilt. It currently isn't rebuilt, but is with this patch applied. This patch copies the technique used in GDB to transform the dep file paths to the proper form. Also, while testing using the depcomp method of dependency tracking (by just hacking the condition), I noticed that depcomp was not found. The path to depcomp seems to be missing a "..". gdb/gdbserver/ChangeLog: * Makefile.in (depcomp): Add "..". (all_deps_files): New and use it. --- gdb/gdbserver/Makefile.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Comments
On 04/19/2018 03:40 AM, Simon Marchi wrote: > gdb/gdbserver/ChangeLog: > > * Makefile.in (depcomp): Add "..". > (all_deps_files): New and use it. LGTM. Thanks, Pedro Alves
On 2018-04-19 13:11, Pedro Alves wrote: > On 04/19/2018 03:40 AM, Simon Marchi wrote: > >> gdb/gdbserver/ChangeLog: >> >> * Makefile.in (depcomp): Add "..". >> (all_deps_files): New and use it. > > LGTM. > > Thanks, > Pedro Alves Thanks, pushed.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 4a54235..c377378 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -62,7 +62,7 @@ AR_FLAGS = rc # Dependency tracking information. DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ -depcomp = $(SHELL) $(srcdir)/../depcomp +depcomp = $(SHELL) $(srcdir)/../../depcomp # Directory containing source files. Don't clean up the spacing, # this exact string is matched for by the "configure" script. @@ -652,8 +652,12 @@ else $(all_object_files) : $(generated_files) endif +# All the .deps files to include. +all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\ + $(dir $(dep))/$(DEPDIR)/$(notdir $(dep))) + # Dependencies. --include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files)) +-include $(all_deps_files) # Disable implicit make rules. include $(srcdir)/../disable-implicit-rules.mk