From patchwork Mon May 1 23:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 68614 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 05DE93858291 for ; Mon, 1 May 2023 23:48:49 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id 6D53B3858D39 for ; Mon, 1 May 2023 23:48:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D53B3858D39 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-pg1-x52f.google.com with SMTP id 41be03b00d2f7-52c30fbccd4so980582a12.0 for ; Mon, 01 May 2023 16:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1682984909; x=1685576909; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=ZLqi/qV4bdw9dmUvOlNkuy/LyCWHAYfn3KdRs4rZd7A=; b=fCAxMbZYahSm40O6yRgYNiH3b6WfD8r9x7KV5twn2tsJwermsj8mj/Xr2RQq9cHGgW G2V6QJ+u34F3Bs/RcTuu8CoF34jGAHdEGwXMEx1FyEkW/QWfnwdJ4ui1jTdWV/RpRRxp xh26ikrXkuHGvQbRaIt8/tdVPqlpKuXnBUvp1bURjfTPs1VVFIigYBskXDt/PLiloTnq bI495gp0IVAnPdqAqG3Q02I1pqmEkni74zPFCJwI9PjmFa1wFBC2AYogqnIJUqy7a4Xl db8U5JqzmPGOMJIDgO8lpbnzLw0viU6LvJy8gYOvjlIpgN9BnuoF3dPHs2ZarIy2csUv J4AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682984909; x=1685576909; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZLqi/qV4bdw9dmUvOlNkuy/LyCWHAYfn3KdRs4rZd7A=; b=iEHfCjdSODpXaByiLBajaoirICR/UdlKi97I5fXNfax9O66RCzQknwzlJvVxPNDEWD BfLHaBVG0NrruSwpNk5yqZrmIfkoBOL6F0d1yBe8Ywk63P0J7sfEUBS5ZaFtwoGrX+V9 AWI7lz/F18NRTynndQOosnFsR6eGJEJjAVNA7D2OvXbCmt2faAM3bxCnRCigkK96kNgX W2NAOdzt9sz/kWZDDiTHSYGF/gml3Rat6BhFGHVBNd5K4ApBTI5evxFaMJTz8tkz5DBU O60/8TpLlmwzR9iFIdLbghhpLToO/0WZ4GvZoxWdSoDOFNKuMpmjzI1Jdb/60X+1w3+9 qmiA== X-Gm-Message-State: AC+VfDw3gwH7JR0aZuzC8fydDzz7fLIbOkklB7RpX7ltyKD5km+q9lCl GVEEu7EvY3KqV5nLggAAtER/za+NZbiWbHeAbDk= X-Google-Smtp-Source: ACHHUZ40ZtQHDjpovA620Boon0ChWSS8DXp4n3U8Yk+8xtPoLWrtQA8KzyBc3TYQz+kvR90w6f8G2Q== X-Received: by 2002:a17:902:f68e:b0:1a6:7510:3341 with SMTP id l14-20020a170902f68e00b001a675103341mr18622935plg.69.1682984909185; Mon, 01 May 2023 16:48:29 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id m23-20020a170902bb9700b001ab025acc8fsm1219542pls.260.2023.05.01.16.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 16:48:28 -0700 (PDT) Subject: [PATCH v3 2/6] elf.h: Remove duplicate STO_RISCV_VARIANT_CC Date: Mon, 1 May 2023 16:47:35 -0700 Message-Id: <20230501234739.7264-3-palmer@rivosinc.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230501234739.7264-1-palmer@rivosinc.com> References: <20230501234739.7264-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: libc-alpha@sourceware.org, Palmer Dabbelt From: Palmer Dabbelt To: maskray@google.com, joseph@codesourcery.com X-Spam-Status: No, score=-11.6 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 --- elf/elf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/elf/elf.h b/elf/elf.h index 4f65b5a32d..0cbd4510c6 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -3937,9 +3937,6 @@ enum #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