public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Palmer Dabbelt <palmer@rivosinc.com>
To: maskray@google.com, joseph@codesourcery.com
Cc: libc-alpha@sourceware.org, Palmer Dabbelt <palmer@rivosinc.com>
Subject: [PATCH v3 3/6] elf.h: Remove duplicate DT_RISCV_VARIANT_CC
Date: Mon,  1 May 2023 16:47:36 -0700	[thread overview]
Message-ID: <20230501234739.7264-4-palmer@rivosinc.com> (raw)
In-Reply-To: <20230501234739.7264-1-palmer@rivosinc.com>

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 <joseph@codesourcery.com>
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 <palmer@rivosinc.com>
---
 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 */
-- 
2.40.0


  parent reply	other threads:[~2023-05-01 23:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-01 23:47 [PATCH v3 0/6] elf.h: Fix and cleanup the RISC-V defines Palmer Dabbelt
2023-05-01 23:47 ` [PATCH v3 1/6] elf.h, scripts: Don't error on duplicate DT_RISCV_NUM Palmer Dabbelt
2023-05-03 12:54   ` Andreas Schwab
2023-05-01 23:47 ` [PATCH v3 2/6] elf.h: Remove duplicate STO_RISCV_VARIANT_CC Palmer Dabbelt
2023-05-01 23:47 ` Palmer Dabbelt [this message]
2023-05-01 23:47 ` [PATCH v3 4/6] elf.h: Reorder DT_RISCV_* Palmer Dabbelt
2023-05-02  3:51   ` Fangrui Song
2023-05-01 23:47 ` [PATCH v3 5/6] elf.h: Reorder SHT_RISCV_* Palmer Dabbelt
2023-05-01 23:47 ` [PATCH v3 6/6] elf.h: Reorder PT_RISCV_* Palmer Dabbelt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230501234739.7264-4-palmer@rivosinc.com \
    --to=palmer@rivosinc.com \
    --cc=joseph@codesourcery.com \
    --cc=libc-alpha@sourceware.org \
    --cc=maskray@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).