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 9E1203858D3C for ; Thu, 5 Oct 2023 11:19:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E1203858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696504768; 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: content-transfer-encoding:content-transfer-encoding; bh=X5AVvxE4h7MBePUHRZeKWxxT7bu55rX0kHChrno5EWA=; b=DTkvL0xYLJNRZiIqdHIb/rdL8GLCngnkcOiJy2r7zrkekl6Dj0E1noBS9MCOFVWJJE5wZE 7Asi8WHEk/428sPtYvlEMuH0lkK/QEIr8h10UuStU7UW6BVpGxxeaEfo5RVD3MGy9phFGB 9+duaKY43RGJyxa69eFmJ3Lbi/YrhCw= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-35-Tlygi_oXNqmztwOfjiR7qg-1; Thu, 05 Oct 2023 07:19:27 -0400 X-MC-Unique: Tlygi_oXNqmztwOfjiR7qg-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-5a1eb48d346so12090907b3.3 for ; Thu, 05 Oct 2023 04:19:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696504766; x=1697109566; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X5AVvxE4h7MBePUHRZeKWxxT7bu55rX0kHChrno5EWA=; b=nvXyLvTO3HUKu4vz9np6k7mvZ+TOnfWY7dvs27tXQAuXeIlBkyBrc4C0hlwFFoDpSV whcG31EwfvOaDyspSEYsiTvK/ZdahIO2ngs1p7UIStL+pqwFgpYxlsQYyeQmH9qBnzHl wXUMA1QnexjsbjkQb00//bWSNCKPXbvg79BPJxCfxAfeEfYLwM1pQRWcz1PdJYLZ+u9Q YCGDpKzdlVRgUqhDM8GLtbG+vePJxwXssjM6P0NV2Sjtx12LJ4ZQOJDeVdTlIAIVpz7w zid9hMHNTq8rY5l19Chx3vjPXHSEyCkTINuuBFuz0yIMQhE6/fD8kq3b3oyUsE21JD2v MFmw== X-Gm-Message-State: AOJu0Yx3mFW2D3dIa6fhY8iNir5OuWBNxbQ3S8VleWWEYGOAJNGaZuw0 G218S9tkpmtxp6EZ9jxNC4Qr9D7oxo+fv6gd9ZQLXoe5+PB2eacaor7P0D7p7w1TGGsRkYgUdyL XtNzHbS6LNIUN7ndES0Hf7UZAlw7tWPM/LV/HtzhdwoyE8iMTg93d9+EWVQia+J7gkPMID1DqjB jrshmCig== X-Received: by 2002:a25:bb83:0:b0:d80:1bbf:fabf with SMTP id y3-20020a25bb83000000b00d801bbffabfmr4184804ybg.2.1696504766479; Thu, 05 Oct 2023 04:19:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESYpQV7APErPAtniGbaQDQhe5KlFN1DCXHre93seiUFp+Fs8qbmNjhnVFqyNfctLKQNKedmw== X-Received: by 2002:a25:bb83:0:b0:d80:1bbf:fabf with SMTP id y3-20020a25bb83000000b00d801bbffabfmr4184791ybg.2.1696504766006; Thu, 05 Oct 2023 04:19:26 -0700 (PDT) Received: from localhost ([31.111.84.209]) by smtp.gmail.com with ESMTPSA id n4-20020a0c9d44000000b0065af4977ea3sm425538qvf.24.2023.10.05.04.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 04:19:25 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Luis Machado Subject: [PATCH] gdbserver: fix gdbserver builds after expedite_regs changes Date: Thu, 5 Oct 2023 12:19:22 +0100 Message-Id: <3ae39ff41ea9a6832f24e3fe8425304a25ac671c.1696504740.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.6 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 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: After this commit: commit 6a65998a8a94abaaae7ca4ff0ab9c3f25dc2e766 Date: Mon Sep 11 12:42:00 2023 +0100 Convert tdesc's expedite_regs to a string vector The risc-v, loongarch, and csky gdbserver builds were broken. A use of target_desc::expedite_regs (for each architecture) was not updated to take account of the type change. I've tested that this fixes the risc-v build. I haven't tested the other architectures, but they should be fine. --- gdbserver/linux-csky-low.cc | 7 +++++-- gdbserver/linux-loongarch-low.cc | 7 +++++-- gdbserver/linux-riscv-low.cc | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdbserver/linux-csky-low.cc b/gdbserver/linux-csky-low.cc index 3117556f5de..feb428ec9d2 100644 --- a/gdbserver/linux-csky-low.cc +++ b/gdbserver/linux-csky-low.cc @@ -132,8 +132,11 @@ csky_target::low_arch_setup () static const char *expedite_regs[] = { "r14", "pc", NULL }; target_desc_up tdesc = csky_create_target_description (); - if (!tdesc->expedite_regs) - init_target_desc (tdesc.get (), expedite_regs); + if (tdesc->expedite_regs.empty ()) + { + init_target_desc (tdesc.get (), expedite_regs); + gdb_assert (!tdesc->expedite_regs.empty ()); + } current_process ()->tdesc = tdesc.release (); diff --git a/gdbserver/linux-loongarch-low.cc b/gdbserver/linux-loongarch-low.cc index ead2e76d25d..3eb87f55d0f 100644 --- a/gdbserver/linux-loongarch-low.cc +++ b/gdbserver/linux-loongarch-low.cc @@ -84,8 +84,11 @@ loongarch_target::low_arch_setup () features.xlen = sizeof (elf_greg_t); tdesc = loongarch_create_target_description (features); - if (!tdesc->expedite_regs) - init_target_desc (tdesc.get (), expedite_regs); + if (tdesc->expedite_regs.empty ()) + { + init_target_desc (tdesc.get (), expedite_regs); + gdb_assert (!tdesc->expedite_regs.empty ()); + } current_process ()->tdesc = tdesc.release (); } diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc index 129bc3b138b..4c251bb179c 100644 --- a/gdbserver/linux-riscv-low.cc +++ b/gdbserver/linux-riscv-low.cc @@ -90,8 +90,12 @@ riscv_target::low_arch_setup () = riscv_linux_read_features (lwpid_of (current_thread)); target_desc_up tdesc = riscv_create_target_description (features); - if (!tdesc->expedite_regs) - init_target_desc (tdesc.get (), expedite_regs); + if (tdesc->expedite_regs.empty ()) + { + init_target_desc (tdesc.get (), expedite_regs); + gdb_assert (!tdesc->expedite_regs.empty ()); + } + current_process ()->tdesc = tdesc.release (); } base-commit: 0515a7b643c6f7bbfb647764b702d4c6445618e8 -- 2.25.4