From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id 756FD3850425 for ; Wed, 18 May 2022 18:00:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 756FD3850425 Received: by mail-il1-x12a.google.com with SMTP id 3so2065378ily.2 for ; Wed, 18 May 2022 11:00:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2QZhNGOHFdlYZ26ts6O4BfidXbeyHLDMpZV2eWTZ3Fc=; b=B7DDli9QSJxPWvThbNLb344WNPvhQVmh2bhqlVJqaHYCTVipVvLUG/8pQsqlGTUuPr C+Vsc3Y0sKhlVtaamCnekqWBlPDrKq0EWy3Qq3ceCDnuPqz/ZFs9pk0fkPuf2W0RD1Yj 3lD3NhKOg6ChbiOebGV1fjn/W1A6Yos1K54unJlI8p4aA4xpb10THxA2iMHLJ81Na7h7 zsPfiJaGFW5NlVK8auCHRqAuFjg+mze+M06JlcteufspZjuhIhY5u1ZAW/WITvQBD8f+ VI5nn/04rU9ejWFiO493D6g1s7Qlicv2iTLUGAgUoyXYrOSLs+mQqORjfFTAVDSXm5Oj bV8Q== X-Gm-Message-State: AOAM531jy/CzncZQr53mOZE4yvIxtr4h16nGRW3X0XjrJcKUOuqnWTHV AYq92uNGGZpVOQ+knMICk8MQZq9u1pcDBA== X-Google-Smtp-Source: ABdhPJzwt6bXHrFyskCOjnqVhnwFueh8uw74BC/IW9BaXICOZKKVi49MnQsswVVq3euTYhdGv+PW4g== X-Received: by 2002:a92:602:0:b0:2d1:1497:7235 with SMTP id x2-20020a920602000000b002d114977235mr507283ilg.242.1652896857849; Wed, 18 May 2022 11:00:57 -0700 (PDT) Received: from murgatroyd.Home (71-211-158-194.hlrn.qwest.net. [71.211.158.194]) by smtp.gmail.com with ESMTPSA id r4-20020a92d984000000b002cde6e352ffsm715083iln.73.2022.05.18.11.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 11:00:57 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 05/14] ODR warning for struct ext_link_map Date: Wed, 18 May 2022 12:00:40 -0600 Message-Id: <20220518180049.2337257-6-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220518180049.2337257-1-tromey@adacore.com> References: <20220518180049.2337257-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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, 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 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-List-Received-Date: Wed, 18 May 2022 18:00:59 -0000 This renames the solib-dsbt.c copy of "struct ext_link_map" to avoid an ODR warning. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395 --- gdb/solib-dsbt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c index 0b03f944608..6af47217261 100644 --- a/gdb/solib-dsbt.c +++ b/gdb/solib-dsbt.c @@ -107,7 +107,7 @@ struct ext_elf32_dsbt_loadaddr ext_ptr map; /* struct elf32_dsbt_loadmap *map; */ }; -struct ext_link_map +struct dbst_ext_link_map { struct ext_elf32_dsbt_loadaddr l_addr; @@ -546,7 +546,7 @@ dsbt_current_sos (void) building the solist chain. */ while (lm_addr) { - struct ext_link_map lm_buf; + struct dbst_ext_link_map lm_buf; ext_Elf32_Word indexword; CORE_ADDR map_addr; int dsbt_index; -- 2.34.1