From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 6705D3858D28 for ; Sun, 7 May 2023 03:07:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6705D3858D28 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-x331.google.com with SMTP id 5b1f17b1804b1-3f19ab994ccso32788305e9.2 for ; Sat, 06 May 2023 20:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683428826; x=1686020826; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=kaUqM+8jKdP8lsms8lRWKoMXrNOP0N9NOfGzxkgz7cE=; b=FK4XY2FpdGoE5/YysNdzw1yyZP9bD8XZpw2V6rjkldyzNMlHR3HuVumRLcTAJH9ChI mCf9cmEwR3txerSrkZ+ClTqIyEcIEZOy/T9dJvbQVqudgI5LCtNbbuf4jFx+sG0rW8vk 6N8qgjZumTsn/mZ81FXv4xng0loZGdvFxQR1HHK55OcIc86I8DGvu4/sSxYqEDuA6kID zvJfVIQfA8FXYFNJMQmmysJEuJfeK4EeQcyE/KqHE+DbU3isE4usZcyudKBvVTveiUZk x3lqtzgtY18lG90gSqRfDQQtYaAQmxgaIHsxmVgIDo31Kl1YfdNmrj+QnAeYyF+jl0Y+ 1v3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683428826; x=1686020826; h=content-transfer-encoding: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=kaUqM+8jKdP8lsms8lRWKoMXrNOP0N9NOfGzxkgz7cE=; b=gfkz/H/0B2zc9mcLFjLJ3Uzyb+uqNG4LuOk+z/V0Xaf1VyLVOimHjcfBzAGSyQqvVE U8oj/fai9tSDY3Je+6RvYe42UdV2Q/AyUv+Qm6+WUlLPellJkvNTJiO4mJoVNATGHT7T sMBgmAY0OeMdgK9Dg++PK7MYXLCOe+zbm1njjiw+Kx9mwOkWHCC9K02IHnnTohu2ANnI 1iVBqSaWudWz8eu8+HDgF4lFQPHTQbqjlYp8pPDO/5WYk6ZoCAlbIrOeQHXKZKGnQpd3 LDD0EiF215uyAfY++CEJHaAxUKPr8LNUOGqRkWe6uAhPC35IKowX7/X5MbZDC8sovd+J 2gvA== X-Gm-Message-State: AC+VfDxPnnnQpd03+C2+wsJrWK759x0/3MgcQ9DRwC/Tjp48YLBq+mBb c4TL0a+19lr4K1G3u8+ZQAQB2PIHrDJy2lS162sOZw== X-Google-Smtp-Source: ACHHUZ74kUypIoHgIxM4CDho3U81WSbY8N+KJJ36uXrGihSBlj8+W+2QGQkmD2ayCvvpJZGZJc6+zNqoOZA6IuAzc7o= X-Received: by 2002:a05:600c:231a:b0:3f1:789d:ad32 with SMTP id 26-20020a05600c231a00b003f1789dad32mr4545191wmo.11.1683428825870; Sat, 06 May 2023 20:07:05 -0700 (PDT) MIME-Version: 1.0 References: <20230507023737.4052382-1-ppluzhnikov@google.com> <2ba5a269a18dc45a34778cc89d1e40eb3ba71c74.camel@xry111.site> In-Reply-To: <2ba5a269a18dc45a34778cc89d1e40eb3ba71c74.camel@xry111.site> From: Paul Pluzhnikov Date: Sat, 6 May 2023 20:06:38 -0700 Message-ID: Subject: Re: [PATCH] Fix [BZ# 30402] (failing tests elf/tst-{glibcelf,relro-ldso,relro-libc}) To: Xi Ruoyao Cc: GLIBC Devel , Hsiangkai Wang Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-25.7 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,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: You are right. I tweaked the commit message, but then sent the wrong 'git format-patch' result (contents of the patch is the same, only the commit message is updated). Sorry about that. I've updated the subject of this thread. The tweaked commit message is: Fix [BZ# 30402] (failing tests elf/tst-{glibcelf,relro-ldso,relro-libc}) 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 which 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. On Sat, May 6, 2023 at 7:59=E2=80=AFPM Xi Ruoyao wrote= : > > The subject should be "Fix elf/tst-glibcelf". Sorry for nitpicking but > glib is a completely different library, so let's not puzzle people :). > > On Sun, 2023-05-07 at 02:37 +0000, Paul Pluzhnikov via Libc-alpha 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 > > -- > Xi Ruoyao > School of Aerospace Science and Technology, Xidian University --=20 Paul Pluzhnikov