From patchwork Fri Apr 28 18:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 68509 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3F4743857705 for ; Fri, 28 Apr 2023 18:21:20 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id E0E043858D37 for ; Fri, 28 Apr 2023 18:21:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E0E043858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1a8097c1ccfso2653335ad.1 for ; Fri, 28 Apr 2023 11:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1682706066; x=1685298066; h=to:from:cc:content-transfer-encoding:mime-version:message-id:date :subject:from:to:cc:subject:date:message-id:reply-to; bh=m6cwijNAWtM/Sw7V+OMUm7B1SAi+t4qF1Swne5kS+dk=; b=U6Ohow0GjuzZuSyryBrqw9HDFHjvc7qm2eaVNnLgZht5CSM+ZtGZ3S52u1qiQ2iJC8 yNjucR/Du3BfKkam94z/0wR2F2PShvKb9n4MS6+P8ILPcTLd+bQ723Vd4NnkqMQJz9vj amJ5Mb4i5FF/yYEcHp1uOe9sTKvIrQ/hD0ak5IdFkgN8JRGa7UDpSbHiVMMOdxwYr55E zDbg7ScSvfnM6X2rW7J3sxHLtl2p/6LLgFpUSoK3ixtWZ2RmMGararXJvasMyB1iFN7H wkSD97+mNjavmPhOSJyG78bTRP5EaOIoE26a/EDIBjFTeMK3NgR+6obWdoWCJrdp5V+H O1Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682706066; x=1685298066; h=to:from:cc:content-transfer-encoding:mime-version:message-id:date :subject:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=m6cwijNAWtM/Sw7V+OMUm7B1SAi+t4qF1Swne5kS+dk=; b=I/e9RcTclj5Z5udMPTZfwECT0u1z5Z60XkagFmXDQ0U7rPC0miCSfccpnzeFM/e3kE Dji8aAc/8p5vKRxUDmqf70j+i6Ou/YY087eHLfuBRGpmheRa8Hkc4c6mnFq2+ulvORPB WRvlBfTOU9jKW6aqbKMKLy6832/oOl7rN45vFj25n0eqdfhUH4moch7Ioi3hAByrY8xC C0JPQrHrQzAq7hi3Q/0vxge1T3kKp9ltk9IP3LEsO/u8L4BLr3BfpJ7BRU/V5erXqhn7 S+pEvddpWiT69P+gYnUU9umC/cBo8C9GEXdnk94v3cv74XcFmdXW0al803YScmIw55cX uIiA== X-Gm-Message-State: AC+VfDxH0MMSO9E7ZYUxlMPHDqqsIOlfKEvWtcY9OzAQP9pzCMl4UJQ/ No9oJPGHwSdyhrI47qmG8qKgkubdZLDesK9dpOs= X-Google-Smtp-Source: ACHHUZ6TAlz15UqBhSIxuQeijPaUM3hxgf+EIAMdta81I7dvBtjqdqAp9vtL5jlqRwP8llyh2TZZfw== X-Received: by 2002:a17:902:d2c5:b0:1a1:bf22:2b6e with SMTP id n5-20020a170902d2c500b001a1bf222b6emr7831077plc.43.1682706066320; Fri, 28 Apr 2023 11:21:06 -0700 (PDT) Received: from localhost ([135.180.227.0]) by smtp.gmail.com with ESMTPSA id q7-20020a170902bd8700b001a6ff7bd4d9sm13537948pls.15.2023.04.28.11.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 11:21:05 -0700 (PDT) Subject: [PATCH] elf.h: Drop duplicate DT_RISCV_VARIANT_CC Date: Fri, 28 Apr 2023 11:19:48 -0700 Message-Id: <20230428181947.21780-1-palmer@rivosinc.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Cc: libc-alpha@sourceware.org, Palmer Dabbelt From: Palmer Dabbelt To: joseph@codesourcery.com X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" I missed the update from last year that included these already, having duplicates breaks the build due to redefinition errors like elf/elf.h:4013: error: macro STO_RISCV_VARIANT_CC redefined elf.h:3941: note: location of previous definition Reported-by: Joseph S. Myers Fixes: 117e8b341c ("riscv: Resolve symbols directly for symbols with STO_RISCV_VARIANT_CC.") Link: https://inbox.sourceware.org/libc-alpha/mhng-0d9fb5a0-63fa-4b02-8029-7c20232f39ee@palmer-ri-x1c9/T/#t Signed-off-by: Palmer Dabbelt --- bulid-many-glibcs is still churning and might take a bit, but looks like this was just a silly mistake on my end. I'm pretty confident this fixes the issue, but happy to wait for the tests to finish given that I just screwed this up. That was before coffee, though, so maybe I can avoid some of the blame... ;) --- elf/elf.h | 7 ------- 1 file changed, 7 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