From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by sourceware.org (Postfix) with ESMTPS id 881BD3858D28 for ; Sun, 7 May 2023 02:37:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 881BD3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=flex--ppluzhnikov.bounces.google.com Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-517bfcfe83fso1444567a12.2 for ; Sat, 06 May 2023 19:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683427061; x=1686019061; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=O01F8okgOFCFYBLfKAar3lEa8JN6wHaQYj6IpZHDnuM=; b=f7FK53ynROJJR7julda0/NQVPuE80upvm/5i0zQGozBxqCZBj4+fQPdUCtQ0t/4e1+ 0RrxAD+G/DhCydhp6kvGhBpbRvmjNnpEvwaCJ7vs4AvjbuKTjxqLoTYddw1bUXHZ7I9F oruFGgtY5+2MkfSJN7g2QKdCvINjt6GmSHfDmSoiIfG2Xyj3J/cUnI0HuPGjaCSc/dC/ MMny/t+Ua1mS8zf/t8LNpp+5D8aldyywKkFVNbx2IrNxngtgeM5dBsR5p9daGeI/71MU 9L4dOX/VaT1W7bh8QJjve+WsvSI5L6yEVQPb4hP6cTEP3+jvBvBOXvQLjkunvNzUycQV gyyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683427061; x=1686019061; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=O01F8okgOFCFYBLfKAar3lEa8JN6wHaQYj6IpZHDnuM=; b=VBX3fMXYT6SAdQ368WYSd84Cq8GqlcTgB3EPI99Z6a8bHT2d8DER+af4mN4LFYD4xZ /IkMGrvB8iULiRtosgRPVdO/dnIGwQ/iEFgnpjQvyNXi75XjwNZSBrt5nM+ixj8kp7lK pkDiz12friVqZanW3c2ZRrGsiplFDRLY5XX81xR4eccsk8BY7k4JHT82LZuqwkZxEoCq aRQtiBJ14zcDGva5r0/1pqk5NqEK/l1/6h+MRkqWjcXUyKvOzq02jpzEtVSxYlmzOo3l byoh5YJv+YKGFeJLFHQ3bUwF5x57hjMSMRg/6kdFPMaJrPbU+IpbLVTW6nUGT0O8mVaz OgPg== X-Gm-Message-State: AC+VfDxrlXoLI9Fc4ZkairkCS2hkDuNTj/OlDon6x9MnWG+uBLR49Rei OWzY9vSlgi4M2nCjrI7lqObY9ZhSEN2QsIWiW9+eTw1xzGZU8ceNdQjqGZc9u5c6EW+Cp69+hIh he0e12BaqvbYEhr541+xucQjrYkI9/xqIlDnlXlCTJVzQwG/VAXjt9SOt+CGOvrg8IqlnFoSsUh kH0JY= X-Google-Smtp-Source: ACHHUZ478CU0tGtvDHmSPo+ouCbsddUj3WY5bVGsDerORqq6lc5/1v7A84+0jP514Fpe7pnlgzH6Tfdfc7QKvzUe4A== X-Received: from elbrus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:12e9]) (user=ppluzhnikov job=sendgmr) by 2002:a63:115:0:b0:520:e728:8894 with SMTP id 21-20020a630115000000b00520e7288894mr1644999pgb.5.1683427061486; Sat, 06 May 2023 19:37:41 -0700 (PDT) Date: Sun, 7 May 2023 02:37:37 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.521.gf1e218fcd8-goog Message-ID: <20230507023737.4052382-1-ppluzhnikov@google.com> Subject: [PATCH] Fix elf/tst-glibelf [BZ# 30402] From: Paul Pluzhnikov To: libc-alpha@sourceware.org Cc: Hsiangkai Wang , Paul Pluzhnikov Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-19.9 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,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,USER_IN_DEF_DKIM_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: 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