public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* error: macro DT/STO_RISCV_VARIANT_CC redefined
@ 2023-05-01  8:40 Samuel Thibault
  2023-05-01  8:42 ` Samuel Thibault
  0 siblings, 1 reply; 5+ messages in thread
From: Samuel Thibault @ 2023-05-01  8:40 UTC (permalink / raw)
  To: libc-alpha, kai.wang, palmer, vincent.chen

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: error: macro DT/STO_RISCV_VARIANT_CC redefined
  2023-05-01  8:40 error: macro DT/STO_RISCV_VARIANT_CC redefined Samuel Thibault
@ 2023-05-01  8:42 ` Samuel Thibault
  2023-05-01 12:42   ` Palmer Dabbelt
  0 siblings, 1 reply; 5+ messages in thread
From: Samuel Thibault @ 2023-05-01  8:42 UTC (permalink / raw)
  To: libc-alpha, kai.wang, palmer, vincent.chen

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: error: macro DT/STO_RISCV_VARIANT_CC redefined
  2023-05-01  8:42 ` Samuel Thibault
@ 2023-05-01 12:42   ` Palmer Dabbelt
  2023-05-02  3:46     ` Fangrui Song
  0 siblings, 1 reply; 5+ messages in thread
From: Palmer Dabbelt @ 2023-05-01 12:42 UTC (permalink / raw)
  To: samuel.thibault; +Cc: libc-alpha, kai.wang, vincent.chen

On Mon, 01 May 2023 01:42:08 PDT (-0700), samuel.thibault@ens-lyon.org wrote:
> Also, the kai.wang@sifive.com email address doesn't seem to be working,
> the mail server says it doesn't exist...

Sorry, it's my fault -- I committed it thinking the test suite had been 
run, but it hadn't.  I've got some WIP, but I found another test suite 
hook I need last night and I've yet to make sure that's enough as my 
test box went down.

I think we should just go ahead and commit the revert for now?  That way 
we can avoid having other folks be broken while I figure out what's up.

>
> 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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: error: macro DT/STO_RISCV_VARIANT_CC redefined
  2023-05-01 12:42   ` Palmer Dabbelt
@ 2023-05-02  3:46     ` Fangrui Song
  2023-05-07  3:11       ` Paul Pluzhnikov
  0 siblings, 1 reply; 5+ messages in thread
From: Fangrui Song @ 2023-05-02  3:46 UTC (permalink / raw)
  To: Palmer Dabbelt; +Cc: samuel.thibault, libc-alpha, vincent.chen

On Mon, May 1, 2023 at 5:42 AM Palmer Dabbelt <palmer@rivosinc.com> wrote:
>
> On Mon, 01 May 2023 01:42:08 PDT (-0700), samuel.thibault@ens-lyon.org wrote:
> > Also, the kai.wang@sifive.com email address doesn't seem to be working,
> > the mail server says it doesn't exist...
>
> Sorry, it's my fault -- I committed it thinking the test suite had been
> run, but it hadn't.  I've got some WIP, but I found another test suite
> hook I need last night and I've yet to make sure that's enough as my
> test box went down.
>
> I think we should just go ahead and commit the revert for now?  That way
> we can avoid having other folks be broken while I figure out what's up.

I agree that committing a revert for
117e8b341c5c0ace8d65feeef136fececb3fdc9c will be cleaner.
Then you may push another commit adding the macros to a conventional
location, avoiding the duplicate.

Then some of the patches in "[PATCH v3 0/6] elf.h: Fix and cleanup the
RISC-V defines" can be avoided.


> >
> > 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



-- 
宋方睿

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: error: macro DT/STO_RISCV_VARIANT_CC redefined
  2023-05-02  3:46     ` Fangrui Song
@ 2023-05-07  3:11       ` Paul Pluzhnikov
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Pluzhnikov @ 2023-05-07  3:11 UTC (permalink / raw)
  To: Fangrui Song; +Cc: Palmer Dabbelt, samuel.thibault, libc-alpha, vincent.chen

On Mon, May 1, 2023 at 8:47 PM Fangrui Song via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> On Mon, May 1, 2023 at 5:42 AM Palmer Dabbelt <palmer@rivosinc.com> wrote:

> I agree that committing a revert for
> 117e8b341c5c0ace8d65feeef136fececb3fdc9c will be cleaner.
> Then you may push another commit adding the macros to a conventional
> location, avoiding the duplicate.
>
> Then some of the patches in "[PATCH v3 0/6] elf.h: Fix and cleanup the
> RISC-V defines" can be avoided.

In the meantime https://sourceware.org/bugzilla/show_bug.cgi?id=30402
was filed and I just sent a patch to clean this up.


-- 
Paul Pluzhnikov

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-05-07  3:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-01  8:40 error: macro DT/STO_RISCV_VARIANT_CC redefined Samuel Thibault
2023-05-01  8:42 ` Samuel Thibault
2023-05-01 12:42   ` Palmer Dabbelt
2023-05-02  3:46     ` Fangrui Song
2023-05-07  3:11       ` Paul Pluzhnikov

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).