From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9E78F3858C50 for ; Mon, 11 Dec 2023 13:28:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E78F3858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9E78F3858C50 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702301283; cv=none; b=SR8HrcVq+sm1ya1Qd9jai40c6jZtlqXLSTbqD62sdnOBmVsAL87gTAnGCs3XtafWlkJE5TutRtkRBgd8DBeqzV8auJ1ms4Rj6R5H+BlKwhhnwxVuRbX45cFCG/s9H+Egoa/wzX/QpPPOX8zJzci9av4cuNZNxvp5d3dXy/g5Qhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702301283; c=relaxed/simple; bh=IoPeiVPFuRHEIX7MvJgStLlPaZLhAHWjQgI4J5sR44I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SQ/PiWrWcx4pBCIfW62hyTzDxqhWqcvYv7j72VqE3GCCgV96QC6x2Xnyk809Ok/peCs83ZY8TkNSoncjXrLB2jc8A0rQdFnOvq5aPNZhVRi8Eg7P2jLWj20xht0gHhxZQtWWPb+q81PMji8IwYsoUrv1bhLhd/FBS7jV9wTYfeo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702301282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QdAlBaXDxVfG8En2Hx20t7fXjtA+XVppnD7Z+Q/TI5I=; b=AIMCj1VmBfNJpF/2E84BaXvk//s5Qk0xDQyVKOpDG0Fdntf/3/78obGmbzgL4qUU+kzEtK ja0GZYMK00Py0Cw1E2NZOqJ68yZN9+nOnHaUhuIJjDEJ4oIetIT0fcooqm4whKgxzdnIw9 ovXEJI+VxXGPxHj52vxIDXu5/42OZxY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-117-H0aLcM1yPm-XBzv9_siw5Q-1; Mon, 11 Dec 2023 08:28:00 -0500 X-MC-Unique: H0aLcM1yPm-XBzv9_siw5Q-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c440f9595so7421085e9.2 for ; Mon, 11 Dec 2023 05:28:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702301279; x=1702906079; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QdAlBaXDxVfG8En2Hx20t7fXjtA+XVppnD7Z+Q/TI5I=; b=bJu7H3VEc0/KuTKfWpttNOeL/cR4bx7i/nlAP6mlSSup0+oMmzcCt3+VfZ/z5s+xWP A8PSZ2oycB7TzwUoIwJF6kKyZGpt+syPdaLbskmoA1a9AqpcZPyEi0Cs/opqfVfCy37l kxl6AFPO9585mhoW27CUniPE/DLoA6EF3WHCHBTx+t2sqF9GLk6TWsdMQ4yxn8nqxG30 R2okdEcr9hB6q+LcSGTsF1x/ZGI+iCqQC97eT81FqKmevXTDY/Uyhamy0dXBAErJWKk0 M0NSHVLsa91/WFKQPQ1wGgD6LVuCvifiy6/bHayx7yNnUg7BM3dBzojFPNOPq+JAZZSW 95ZQ== X-Gm-Message-State: AOJu0YxySoJOtxHbI5BUaaf5hp5PaBuaguYY8MXc+c/pkf8p16dtzmnT zU+30ENRbi3nXcYERGc0afQv78H5ZpPZKsLxMhjtzCsvS+ozyGlnoceUbYG+HSezyfaTAw1ihCc zqYDv6sY7Pz3oHjb+xqwVig== X-Received: by 2002:a05:600c:4384:b0:40c:2251:a407 with SMTP id e4-20020a05600c438400b0040c2251a407mr2500834wmn.50.1702301279481; Mon, 11 Dec 2023 05:27:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHi5dEvaHNIQGy2SU9z6PUh1VMoTI5Cpq7sDJDMo44XRIwU1/u2Cpo7aV7PuAasd1TQyzCxrA== X-Received: by 2002:a05:600c:4384:b0:40c:2251:a407 with SMTP id e4-20020a05600c438400b0040c2251a407mr2500828wmn.50.1702301279077; Mon, 11 Dec 2023 05:27:59 -0800 (PST) Received: from localhost (105.226.159.143.dyn.plus.net. [143.159.226.105]) by smtp.gmail.com with ESMTPSA id d20-20020adfa354000000b00334b1564f0esm8587128wrb.89.2023.12.11.05.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 05:27:58 -0800 (PST) From: Andrew Burgess To: Tom Tromey , gdb-patches@sourceware.org Cc: Tom Tromey Subject: Re: [PATCH] Use TARGET_SYSROOT_PREFIX in more places In-Reply-To: <20231210231151.4063017-1-tom@tromey.com> References: <20231210231151.4063017-1-tom@tromey.com> Date: Mon, 11 Dec 2023 13:27:57 +0000 Message-ID: <87msugg97m.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: Tom Tromey writes: > I found some spots using "target:"; I think it's better to use the > define everywhere, so this changes these to use TARGET_SYSROOT_PREFIX. > In some spots, is_target_filename is used rather than an explicit > check. Looks good. Approved-By: Andrew Burgess Thanks, Andrew > --- > gdb/build-id.c | 2 +- > gdb/gdb_bfd.h | 8 ++++++++ > gdb/symfile.c | 18 ++++++++++-------- > 3 files changed, 19 insertions(+), 9 deletions(-) > > diff --git a/gdb/build-id.c b/gdb/build-id.c > index f68384f0197..6abf04ffacd 100644 > --- a/gdb/build-id.c > +++ b/gdb/build-id.c > @@ -90,7 +90,7 @@ build_id_to_debug_bfd_1 (const std::string &link, size_t build_id_len, > /* lrealpath() is expensive even for the usually non-existent files. */ > gdb::unique_xmalloc_ptr filename_holder; > const char *filename = nullptr; > - if (startswith (link, TARGET_SYSROOT_PREFIX)) > + if (is_target_filename (link)) > filename = link.c_str (); > else if (access (link.c_str (), F_OK) == 0) > { > diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h > index 604365b61b1..eeb782edcfc 100644 > --- a/gdb/gdb_bfd.h > +++ b/gdb/gdb_bfd.h > @@ -45,6 +45,14 @@ struct registry_accessor > > int is_target_filename (const char *name); > > +/* An overload for strings. */ > + > +static inline int > +is_target_filename (const std::string &name) > +{ > + return is_target_filename (name.c_str ()); > +} > + > /* Returns nonzero if the filename associated with ABFD starts with > TARGET_SYSROOT_PREFIX, zero otherwise. */ > > diff --git a/gdb/symfile.c b/gdb/symfile.c > index 09aa70be1d5..2bfe36ee6ef 100644 > --- a/gdb/symfile.c > +++ b/gdb/symfile.c > @@ -1413,8 +1413,9 @@ find_separate_debug_file (const char *dir, > Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will > cause "/..." lookups. */ > > - bool target_prefix = startswith (dir, "target:"); > - const char *dir_notarget = target_prefix ? dir + strlen ("target:") : dir; > + bool target_prefix = is_target_filename (dir); > + const char *dir_notarget > + = target_prefix ? dir + strlen (TARGET_SYSROOT_PREFIX) : dir; > std::vector> debugdir_vec > = dirnames_to_char_ptr_vec (debug_file_directory.c_str ()); > gdb::unique_xmalloc_ptr canon_sysroot > @@ -1443,7 +1444,7 @@ find_separate_debug_file (const char *dir, > > for (const gdb::unique_xmalloc_ptr &debugdir : debugdir_vec) > { > - debugfile = target_prefix ? "target:" : ""; > + debugfile = target_prefix ? TARGET_SYSROOT_PREFIX : ""; > debugfile += debugdir; > debugfile += "/"; > debugfile += drive; > @@ -1465,7 +1466,7 @@ find_separate_debug_file (const char *dir, > { > /* If the file is in the sysroot, try using its base path in > the global debugfile directory. */ > - debugfile = target_prefix ? "target:" : ""; > + debugfile = target_prefix ? TARGET_SYSROOT_PREFIX : ""; > debugfile += debugdir; > debugfile += "/"; > debugfile += base_path; > @@ -1481,12 +1482,13 @@ find_separate_debug_file (const char *dir, > prefix -- but if that would yield the empty string, we > don't bother at all, because that would just give the > same result as above. */ > - if (gdb_sysroot != "target:") > + if (gdb_sysroot != TARGET_SYSROOT_PREFIX) > { > - debugfile = target_prefix ? "target:" : ""; > - if (startswith (gdb_sysroot, "target:")) > + debugfile = target_prefix ? TARGET_SYSROOT_PREFIX : ""; > + if (is_target_filename (gdb_sysroot)) > { > - std::string root = gdb_sysroot.substr (strlen ("target:")); > + std::string root > + = gdb_sysroot.substr (strlen (TARGET_SYSROOT_PREFIX)); > gdb_assert (!root.empty ()); > debugfile += root; > } > -- > 2.43.0