From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by sourceware.org (Postfix) with ESMTPS id A1B413850416 for ; Wed, 18 May 2022 18:00:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A1B413850416 Received: by mail-io1-xd2e.google.com with SMTP id e3so3150026ios.6 for ; Wed, 18 May 2022 11:00:57 -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=lPpNZMHkl1HEkCB2a2U8cif14/qIvLQ5HPUFEyMwpK4=; b=wQzmhVaEcikHIiib8iiCb3r3uxHO4YaAI4KO6j4TcOw4bGX/KlF2vaj5Gm5S3v+jBN /RntsO6+271opL30oicfnfI0syU1w0b+EBtLk75u+CtfeUTDE8lZ1G3CuXRbMOnS8DxS tN0thafs7nuf4jHj/58M6zm8JNoA5wgZGEoA08fLbkL6eT1hf6m5ttwMyUzSnF2CnSqu IifUUC/bVLvEZiVGc0APY4HS5eOg3rvRG0uovhQV1uXiIY00pD8EOL33ia4PicIzvwKS G9hZAV1BtXNwh/nqz6UO2PWO82Kj3fNABhNrBHUlzBPVRAio5cDCUyTsuzUgYpBmzcXD zcBA== X-Gm-Message-State: AOAM533UprqJtH9NiB1oaIQW+TCvkRUuyk+2WSyNDiJyusWWZ/yXbAB5 Kkc8tOMrU4tOfl+d9nl/ofYvulmINAy99g== X-Google-Smtp-Source: ABdhPJz47JgzLPitl2C5LtfDPT710zX19a7fFT2m4wrvKiE1RGD3VOrC3YmVu5bUwxAPLEBmEAz1qQ== X-Received: by 2002:a02:b90f:0:b0:32e:7cb9:c710 with SMTP id v15-20020a02b90f000000b0032e7cb9c710mr413797jan.224.1652896857002; 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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 11:00:56 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 04/14] ODR warning for struct field_info Date: Wed, 18 May 2022 12:00:39 -0600 Message-Id: <20220518180049.2337257-5-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:58 -0000 This renames one of the instance of "struct field_info" to avoid an ODR warning. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395 --- gdb/rs6000-aix-tdep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c index ead03bf8819..867f21dc634 100644 --- a/gdb/rs6000-aix-tdep.c +++ b/gdb/rs6000-aix-tdep.c @@ -849,7 +849,7 @@ rs6000_aix_osabi_sniffer (bfd *abfd) /* A structure encoding the offset and size of a field within a struct. */ -struct field_info +struct ldinfo_field { int offset; int size; @@ -861,13 +861,13 @@ struct field_info struct ld_info_desc { - struct field_info ldinfo_next; - struct field_info ldinfo_fd; - struct field_info ldinfo_textorg; - struct field_info ldinfo_textsize; - struct field_info ldinfo_dataorg; - struct field_info ldinfo_datasize; - struct field_info ldinfo_filename; + struct ldinfo_field ldinfo_next; + struct ldinfo_field ldinfo_fd; + struct ldinfo_field ldinfo_textorg; + struct ldinfo_field ldinfo_textsize; + struct ldinfo_field ldinfo_dataorg; + struct ldinfo_field ldinfo_datasize; + struct ldinfo_field ldinfo_filename; }; /* The following data has been generated by compiling and running -- 2.34.1