From patchwork Mon May 1 23:47:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 68616 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 C9E1B385702B for ; Mon, 1 May 2023 23:49:09 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 79A893858C83 for ; Mon, 1 May 2023 23:48:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 79A893858C83 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-x630.google.com with SMTP id d9443c01a7336-1aaec6f189cso14395855ad.3 for ; Mon, 01 May 2023 16:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1682984910; x=1685576910; 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=DXlat9UW5n+OiClggah4jJNItXPGvDRUYJ0IWREOQIE=; b=F8MxLfoogmeU3pwsG9WBg4Bgzj1brnWBjNKVF9OwYYYWB/zHusa7DE7C8OEVFWfrWE XGMxkRtHrJttPDnzVqCba9OnJ91Max2wHQ9AsgbP1Wk9mY9vMkuDnZaHpZ9A5nEcZi/+ swmyociCKaY8ZfUkWEE7HFLIJGNIaAYiAZGDk/gJHPTnvRg2za4dRBw6NFd4RpnC1WH0 jbv3eSj2Bwlvs/mz3KuvRQY4jU8tF0tBKlC5DNQYxnm6LyT2AMj/kiQGrWZp5iuE+3d5 CL0c6aNNCio5VgxWBz3w9QW7HhC+LMx/6B/+2AiOdxTDZvWxbN9MDn+HpC+fAlWIQPMO HetQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682984910; x=1685576910; 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=DXlat9UW5n+OiClggah4jJNItXPGvDRUYJ0IWREOQIE=; b=U6aPTv60Zw9DHvb74/eLU3iCd0EhmponUVMI0q5xZhpZLGz0oPiGXgcXUAijFYA8lE AZODI1CLTStHPvikBG659SU4Iry5yNqN+5icx2mh1U7aF3ecTCUbiL6FGvJQnblctJQy Q7g2j3rsXuwCmuvj7HaG/7HWJ8ZHE3HbTThqbC6b7gpSE1qy/TV7w4RwK8Os2TYsaPbh wFRuEjni3IyU/GD4VFziRSsjqZ8udwY9HWGL/r+ZsJpHNnsFkTzTy95q05KUl50S+sKK A8HWZ4ihOzLlV1fVgmytITMzxOnVD+tisHqUaZb842+GGZwZBhvJj4kF8iTIyhHPpzpD bqCQ== X-Gm-Message-State: AC+VfDxoXYCsZP8PRBGIIokwOO79bxrvObElKE7h7U+6ZIENZmyXPxMf P61RrggvCoz5LNJ0DgKFpDLwQoTLO0A7LPYnMWs= X-Google-Smtp-Source: ACHHUZ68VDwru8KIEXP/+jwCmtTl9zDUSJalKBfdh5c0BTf8sskx8m+rGZHqpUPvB+g3jZHl9EaFEw== X-Received: by 2002:a17:902:f649:b0:1a6:a988:b858 with SMTP id m9-20020a170902f64900b001a6a988b858mr14444482plg.58.1682984910257; Mon, 01 May 2023 16:48:30 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id o4-20020a170902778400b001a2135e7eabsm18379583pll.16.2023.05.01.16.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 16:48:29 -0700 (PDT) Subject: [PATCH v3 3/6] elf.h: Remove duplicate DT_RISCV_VARIANT_CC Date: Mon, 1 May 2023 16:47:36 -0700 Message-Id: <20230501234739.7264-4-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.7 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:4023: error: macro DT_RISCV_VARIANT_CC redefined elf/elf.h:3937: 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/elf/elf.h b/elf/elf.h index 0cbd4510c6..4c61d3a5ee 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -3934,7 +3934,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 ELF Flags */