From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by sourceware.org (Postfix) with ESMTPS id D28983858D35 for ; Thu, 5 Jan 2023 16:50:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D28983858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-14ffd3c5b15so31992471fac.3 for ; Thu, 05 Jan 2023 08:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6BYPtDeMkBdiy4UFC6SRn4SuIpZZtYbFDer0bhCH0+E=; b=HiAxHDMKmQU+jTAL7kIQ5J0YPs0Pj86AnBWO8W+NjHwMvA2WYORVMFPdMiOaa+/2li YTF589nncfuEHfMf+5/bUP/5MWW1nUOh9TJLz4NgaaN09TwDi5DKc8Kt3XrkVIL8zBC8 h7FWvP2T9yb6AaooUZ/RF5qthVPjuqsfBB3ImHm4J5xy6nk7iFgM+0v9w1xkq2A97QJp kuWhew7gul2Gi0IZPXBKmiIvqAp5LFVf+7t/JqFCvUL8ZnHoTDlaHJio+AyJdYyLCLOG 0vOAPJc27muT3R6bVapDXyghCQa3QVn0WLJWirlejR6B+oGZcFUQkNhAYPTovOHO27Yj nInw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6BYPtDeMkBdiy4UFC6SRn4SuIpZZtYbFDer0bhCH0+E=; b=lGpS/zAEqE484iOw6OUqU/8ubwbMMZXicLEEH9O28J1R0pYSnvGGKGsFtL9F4+qDpI EK0/HocBOHKetJVSYOSWRjtBmCFt/l05YVgOStzg9Z/NixjQib16r5qdrhjHT78Zclx8 +DeJpn7GnAZU6/8rQuNRiEugjBJjyYChTkDwQ7VIEKVuLb5akOOywAKdR4IrjEUPWvwr aWPPT6n0rrdPwSo30vfhh76OD8qdcqd6jSXSdsIbg8gBBNjNc1UPQsOyPuMpZl/a1cxZ 6tqdOGWMFw7ymXFwgtJttbz3KSoSy6kk0uLrH2wXnWABjvZkOWGXqj3Hdk+Q4MKgXW7N hzaw== X-Gm-Message-State: AFqh2kqqlTQE61WjrckjdL/QLNSLl6WgotFRdYwxcHkTkd9pd2qebHkI oi0QwYEXvUopDsKJLrUi9bP0QS2jCxE6DLgOIfE= X-Google-Smtp-Source: AMrXdXuBfKcy8KYgfCtp4VTklRjH+EUjQbY3PFEEmBcu2EeRo8GByeReFUOqipBQzZOI8q5rIwG+LV1qmFkUawjf6hk= X-Received: by 2002:a05:6870:d202:b0:148:2c02:5323 with SMTP id g2-20020a056870d20200b001482c025323mr5062477oac.298.1672937456564; Thu, 05 Jan 2023 08:50:56 -0800 (PST) MIME-Version: 1.0 References: <20230104191414.149668-1-hjl.tools@gmail.com> <707373e1-01e6-21ea-c407-db61da912e22@suse.com> In-Reply-To: <707373e1-01e6-21ea-c407-db61da912e22@suse.com> From: "H.J. Lu" Date: Thu, 5 Jan 2023 08:50:20 -0800 Message-ID: Subject: Re: [PATCH] x86: Remove duplicated I386_PCREL_TYPE_P/X86_64_PCREL_TYPE_P To: Jan Beulich Cc: binutils@sourceware.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3014.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Jan 4, 2023 at 11:42 PM Jan Beulich wrote: > > On 04.01.2023 20:14, H.J. Lu via Binutils wrote: > > I386_PCREL_TYPE_P and X86_64_PCREL_TYPE_P are defined twice. Remove > > the duplications. > > I recall noticing this as well, quite some time back, but I didn't feel > like touching it because I was puzzled by ... > > > --- a/bfd/elfxx-x86.h > > +++ b/bfd/elfxx-x86.h > > @@ -97,13 +97,6 @@ > > #define PLT_FDE_START_OFFSET 4 + PLT_CIE_LENGTH + 8 > > #define PLT_FDE_LEN_OFFSET 4 + PLT_CIE_LENGTH + 12 > > > > -#define I386_PCREL_TYPE_P(TYPE) ((TYPE) == R_386_PC32) > > ... this not including PC8 and PC16 when ... This is I386_PCREL_TYPE_P. > > -#define X86_64_PCREL_TYPE_P(TYPE) \ > > - ((TYPE) == R_X86_64_PC8 \ > > - || (TYPE) == R_X86_64_PC16 \ > > - || (TYPE) == R_X86_64_PC32 \ > > - || (TYPE) == R_X86_64_PC64) > > ... this does. This is X86_64_PCREL_TYPE_P, not I386_PCREL_TYPE_P. > Jan The current ones have #define X86_64_PCREL_TYPE_P(TYPE) \ ((TYPE) == R_X86_64_PC8 \ || (TYPE) == R_X86_64_PC16 \ || (TYPE) == R_X86_64_PC32 \ || (TYPE) == R_X86_64_PC64) #define I386_PCREL_TYPE_P(TYPE) ((TYPE) == R_386_PC32) and the ones I removed are -#define I386_PCREL_TYPE_P(TYPE) ((TYPE) == R_386_PC32) -#define X86_64_PCREL_TYPE_P(TYPE) \ - ((TYPE) == R_X86_64_PC8 \ - || (TYPE) == R_X86_64_PC16 \ - || (TYPE) == R_X86_64_PC32 \ - || (TYPE) == R_X86_64_PC64) They are identical. -- H.J.