From patchwork Wed Jan 11 17:45:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 62953 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 58B233858C83 for ; Wed, 11 Jan 2023 17:45:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 58B233858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673459135; bh=7uXjypZaJnr1y+LEyFf8LvrAURQsXA7IUqJY022Dfr0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=dmEqzRps1HqjYyDMwlzVx7ktITjsnSvY1hB3yFXHLs9usnh/GaPUb7LX0PjHQRkU0 WMnmZG0T4P9IBAWHFuhXox+VF+uY4JqcUfH9i2qweW6BTX6nG8BfeiV7V75i7DQGvp xd6s6l1LJFCKECYEJmV7HeIQa5VHW9qryYpOJj98= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by sourceware.org (Postfix) with ESMTPS id B093D3858C66 for ; Wed, 11 Jan 2023 17:45:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B093D3858C66 Received: by mail-oo1-xc31.google.com with SMTP id d2-20020a4ab202000000b004ae3035538bso4211640ooo.12 for ; Wed, 11 Jan 2023 09:45:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7uXjypZaJnr1y+LEyFf8LvrAURQsXA7IUqJY022Dfr0=; b=MeLniG+zhmBK7seXaU/AdRmW2l2mCXRp6gRfeLqnhUIJ02P39x2TnO0v4U5YkXLQao wuLSR+H0J1LADzBFnsppCTgtTQo/aHg+qzA/meLMPRTG7OlLsS7iiZZ9OOaZc0OqSHGp +b8GUCaZy7w22bwWI1Tip58kmMdm1lD4PIMnzF9f4AOdzMhInjqEQAz+crTfSdQAYdIk F5Mu1UmlxgHm2AUryXP4pt+QEuUKAYTlXu6ysLzIsy/QsB2ALJjNBsR/4ncGhgBdVz1F FpxM6LwGe11Mlg4tVf1AYrlNNMA6XWzipNyq9WPKbE3o/rfMVXEfHEUkOG+NeyV6SeJ3 WIqg== X-Gm-Message-State: AFqh2kpzS/ck58pmL5068hf4Ov3mLrPHWq6M+uwd2zjDXZ7aT+oKH2rf EZcEwR43fvSvpaQTZzsw44UAt1HN1oEwtXPe X-Google-Smtp-Source: AMrXdXsXl0MIuuosW6NK8IQdrsSEnYwLRb1nBfzaiT34SqSaDotY06fLjsVIQLC5+9tCiZNsgjr2FA== X-Received: by 2002:a4a:9847:0:b0:4a3:e4d6:dd3b with SMTP id z7-20020a4a9847000000b004a3e4d6dd3bmr10158381ooi.2.1673459110026; Wed, 11 Jan 2023 09:45:10 -0800 (PST) Received: from localhost ([2804:14d:7e39:8470:8ed0:c23:cc24:2826]) by smtp.gmail.com with ESMTPSA id x18-20020a4ac592000000b004a3543fbfbbsm7254354oop.14.2023.01.11.09.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 09:45:09 -0800 (PST) To: gdb-patches@sourceware.org Cc: Thiago Jung Bauermann Subject: [PATCH] gdb: Update gdbarch.py with latest changes in gdbarch.c Date: Wed, 11 Jan 2023 17:45:01 +0000 Message-Id: <20230111174501.3699871-1-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thiago Jung Bauermann via Gdb-patches From: Thiago Jung Bauermann Reply-To: Thiago Jung Bauermann Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Commit 2b16913cdca2 ("gdb: make gdbarch_alloc take ownership of the tdep") changed gdbarch.c without updating gdbarch.py. As a result, running gdbarch.py reverts those changes and causes the build to fail. So change gdbarch.py to generate the current version of gdbarch.c. --- gdb/gdbarch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/gdbarch.py b/gdb/gdbarch.py index d2bf86039d11..7dc79386940f 100755 --- a/gdb/gdbarch.py +++ b/gdb/gdbarch.py @@ -286,7 +286,7 @@ with open("gdbarch.c", "w") as f: print(f" {c.type} {c.name};", file=f) print(file=f) print(" /* target specific vector. */", file=f) - print(" struct gdbarch_tdep_base *tdep = nullptr;", file=f) + print(" gdbarch_tdep_up tdep;", file=f) print(" gdbarch_dump_tdep_ftype *dump_tdep = nullptr;", file=f) print(file=f) print(" /* per-architecture data-pointers. */", file=f) @@ -316,13 +316,13 @@ with open("gdbarch.c", "w") as f: print(file=f) print("struct gdbarch *", file=f) print("gdbarch_alloc (const struct gdbarch_info *info,", file=f) - print(" struct gdbarch_tdep_base *tdep)", file=f) + print(" gdbarch_tdep_up tdep)", file=f) print("{", file=f) print(" struct gdbarch *gdbarch;", file=f) print("", file=f) print(" gdbarch = new struct gdbarch;", file=f) print(file=f) - print(" gdbarch->tdep = tdep;", file=f) + print(" gdbarch->tdep = std::move (tdep);", file=f) print(file=f) for c in filter(info, components): print(f" gdbarch->{c.name} = info->{c.name};", file=f)