error: macro DT/STO_RISCV_VARIANT_CC redefined

[Samuel Thibault]

Also, the kai.wang@sifive.com email address doesn't seem to be working,
the mail server says it doesn't exist...

Samuel Thibault, le lun. 01 mai 2023 10:40:30 +0200, a ecrit:
> Hello,
> 
> I'm getting these errors:
> 
> FAIL: elf/tst-relro-ldso
> FAIL: elf/tst-relro-libc
> FAIL: elf/tst-glibcelf
> 
> /mnt/scratch/sthibault/build-glibc/src/glibc/scripts/../elf/elf.h:4013: error: macro STO_RISCV_VARIANT_CC redefined
> /mnt/scratch/sthibault/build-glibc/src/glibc/scripts/../elf/elf.h:3941: note: location of previous definition
> /mnt/scratch/sthibault/build-glibc/src/glibc/scripts/../elf/elf.h:4023: error: macro DT_RISCV_VARIANT_CC redefined
> /mnt/scratch/sthibault/build-glibc/src/glibc/scripts/../elf/elf.h:3937: note: location of previous definition
> Traceback (most recent call last):
>   File "/mnt/scratch/sthibault/build-glibc/src/glibc/elf/tst-relro-symbols.py", line 33, in <module>
>     import glibcelf
>   File "/mnt/scratch/sthibault/build-glibc/src/glibc/elf/../scripts/glibcelf.py", line 226, in <module>
>     _elf_h = _parse_elf_h()
>   File "/mnt/scratch/sthibault/build-glibc/src/glibc/elf/../scripts/glibcelf.py", line 223, in _parse_elf_h
>     raise IOError('parse error in elf.h')
> OSError: parse error in elf.h
> 
> and indeed, elf/elf.h defines STO_RISCV_VARIANT_CC and
> DT_RISCV_VARIANT_CC twice.
> 
> This seems to have been introduced by 117e8b341c5c ("riscv: Resolve
> symbols directly for symbols with STO_RISCV_VARIANT_CC.")?
> 
> Samuel