[v3,2/6] elf.h: Remove duplicate STO_RISCV_VARIANT_CC

Message ID 20230501234739.7264-3-palmer@rivosinc.com
State Superseded
Series elf.h: Fix and cleanup the RISC-V defines |


Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Palmer Dabbelt May 1, 2023, 11:47 p.m. UTC
  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 <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 | 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_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