From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id BC45E3858D28 for ; Sun, 7 May 2023 02:43:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC45E3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=google.com Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f1950f5676so32717315e9.3 for ; Sat, 06 May 2023 19:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683427405; x=1686019405; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=B6G5nr9y86M7EHHHlwOS9EnnL7jZSQjpeLbMZclQHBY=; b=qpTnEk+J03vLQrQtas+h18Wdxie9GwQds1OQZtvGuxmwxr0GwpC67y5UR/KGwC7nL0 DQ0WtPdnIEXy/BlZwHs+HVzEUrY5K6bmqYLsbJlfcWp6dqemCdpb5rlsK1DTC7VIZRxJ Z1Tf9EicBiCYRDxyL0tse3eDLwB8w00m/WvaVoxDn+Kg8QqaMsEtjwJjQKt3tl7YMq1X bAzqdulsMDDATq+jRHPnq4i1xWz0D04vuqMeaDSvO1awrkcSRV2ZAuN3WLv1Gsu2B/iz Vr6zR0sCXA7MJBub2hX2NWCg+kx0HT4NdtGJRa9Ac4pi7/k3GO3oGNm+XewGe+UiVo2b OrEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683427405; x=1686019405; 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=B6G5nr9y86M7EHHHlwOS9EnnL7jZSQjpeLbMZclQHBY=; b=T0ALl3yeSky7oatYmTmvtSCHL/zNBCHg1yyO1nVfh7kc7HaFwyhx6ZjkK9nR8driuO /sekcaLPvmku4ul3Yq+/NOeyTGXJA6au2/T6nXEAAhP030ySenkGZlrTHZwa/v4+XIa+ eN4GJZbr10wCO3dlEOcJO4GCJYCkkxADzn8EF44msiOqWpX/Q73yyZ+73rsuOM/oLFLF WQaVkCKWhU7D0wmYW04CMbIvDiycjTfDPn58usnyP8K08q7nPF99qBZhfOzUqRw1Dbly 8r7CNe26sxNKLq+QpOK9LA8C4H/kLFGDmvaU3XKPWenXu2fc/dEvPQIOoQ81dUO9mPJv MvFA== X-Gm-Message-State: AC+VfDwG5U1Y2ONORjlVkYDznXjt2qlK6mkYZGHJmgJw0VX18sGyiIK1 co5ivl58A+5z/9DcD9NUiLLkLQdb5O7vSDcVj70Xmxn2BRct9al971heww== X-Google-Smtp-Source: ACHHUZ6UDPc+9d2/4B/25TdJ6Yt9wYwNDzRhOS9n5va+urQ6muqjEiwH+7kgG9XPBfGbdwK6clzvN1PymCHwdyVasmA= X-Received: by 2002:a1c:ed03:0:b0:3f1:9526:22da with SMTP id l3-20020a1ced03000000b003f1952622damr4360721wmh.22.1683427405348; Sat, 06 May 2023 19:43:25 -0700 (PDT) MIME-Version: 1.0 References: <20230507023737.4052382-1-ppluzhnikov@google.com> In-Reply-To: <20230507023737.4052382-1-ppluzhnikov@google.com> From: Paul Pluzhnikov Date: Sat, 6 May 2023 19:42:57 -0700 Message-ID: Subject: Re: [PATCH] Fix elf/tst-glibelf [BZ# 30402] To: libc-alpha@sourceware.org Cc: Hsiangkai Wang Content-Type: multipart/alternative; boundary="00000000000080d53805fb117c10" X-Spam-Status: No, score=-25.9 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL 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: --00000000000080d53805fb117c10 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable +cc hsiangkai@google.com On Sat, May 6, 2023 at 7:37=E2=80=AFPM Paul Pluzhnikov wrote: > Commit 117e8b341c5 added duplicate definitions of DT_RISCV_VARIANT_CC and > STO_RISCV_VARIANT_CC, as well as defining DT_RISCV_NUM to 2 > (conflicts with DT_PLTRELSZ wich is also 2). > > This broke several tests: elf/tst-glibcelf, elf/tst-relro-ldso, > elf/tst-relro-libc. > > Fix this by reverting changes to elf/elf.h and updating > sysdeps/riscv/dl-dtprocnum.h to define DT_THISPROCNUM directly. > --- > elf/elf.h | 7 ------- > sysdeps/riscv/dl-dtprocnum.h | 2 +- > 2 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/elf/elf.h b/elf/elf.h > index 4f65b5a32d..94ca23c1bb 100644 > --- a/elf/elf.h > +++ b/elf/elf.h > @@ -3933,13 +3933,6 @@ enum > > #define R_TILEGX_NUM 130 > > -/* RISC-V specific values for the Dyn d_tag field. */ > -#define DT_RISCV_VARIANT_CC (DT_LOPROC + 1) > -#define DT_RISCV_NUM 2 > - > -/* RISC-V specific values for the st_other field. */ > -#define STO_RISCV_VARIANT_CC 0x80 > - > /* RISC-V ELF Flags */ > #define EF_RISCV_RVC 0x0001 > #define EF_RISCV_FLOAT_ABI 0x0006 > diff --git a/sysdeps/riscv/dl-dtprocnum.h b/sysdeps/riscv/dl-dtprocnum.h > index 281c5aadeb..d16f2415b5 100644 > --- a/sysdeps/riscv/dl-dtprocnum.h > +++ b/sysdeps/riscv/dl-dtprocnum.h > @@ -18,4 +18,4 @@ > > /* Number of extra dynamic section entries for this architecture. By > default there are none. */ > -#define DT_THISPROCNUM DT_RISCV_NUM > +#define DT_THISPROCNUM 2 > -- > 2.40.1.521.gf1e218fcd8-goog > > --=20 Paul Pluzhnikov --00000000000080d53805fb117c10--