From: Palmer Dabbelt <palmer@rivosinc.com>
To: maskray@google.com
Cc: joseph@codesourcery.com, libc-alpha@sourceware.org
Subject: Re: [PATCH] elf.h: Drop duplicate DT_RISCV_VARIANT_CC
Date: Sat, 29 Apr 2023 10:10:28 -0700 (PDT) [thread overview]
Message-ID: <mhng-9dc91bc7-d5ec-45fc-9db8-8dec3bfa6bbc@palmer-ri-x1c9a> (raw)
In-Reply-To: <20230428190451.tkkd72zimqoqa736@google.com>
On Fri, 28 Apr 2023 12:04:51 PDT (-0700), maskray@google.com wrote:
> On 2023-04-28, Palmer Dabbelt wrote:
>>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>
>>---
>>bulid-many-glibcs is still churning and might take a bit, but looks like
>>this was just a silly mistake on my end. I'm pretty confident this
>>fixes the issue, but happy to wait for the tests to finish given that I
>>just screwed this up. That was before coffee, though, so maybe I can
>>avoid some of the blame... ;)
>>---
>> elf/elf.h | 7 -------
>> 1 file changed, 7 deletions(-)
>>
>>diff --git a/elf/elf.h b/elf/elf.h
>>index 4f65b5a32d..94ca23c1bb 100644
>>--- a/elf/elf.h
>>+++ b/elf/elf.h
>>@@ -3933,13 +3933,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
>
> We probably should keep DT_RISCV_NUM. There is just one definition.
Ya, thanks. I'm not sure why I was being an idiot yesterday, but I took
a nap and hopefully things will be better today.
>
>>-/* RISC-V specific values for the st_other field. */
>>-#define STO_RISCV_VARIANT_CC 0x80
>
> The convention appears to place DT_ STO_ definitions after R_
> definitions for a particular processor.
> I'd suggest that we move the definitions below R_ while keeping just one
> copy.
Seems reasonable. I've just sent a v2.
>> /* RISC-V ELF Flags */
>> #define EF_RISCV_RVC 0x0001
>> #define EF_RISCV_FLOAT_ABI 0x0006
>>--
>>2.40.0
>>
prev parent reply other threads:[~2023-04-29 17:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 18:19 Palmer Dabbelt
2023-04-28 19:04 ` Fangrui Song
2023-04-29 17:10 ` Palmer Dabbelt [this message]
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=mhng-9dc91bc7-d5ec-45fc-9db8-8dec3bfa6bbc@palmer-ri-x1c9a \
--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).