Date: Fri, 20 Jan 2023 19:29:59 -0700 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 34784d17eb2b - main - elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h Message-ID: <CANCZdfphY8XLEmi%2Bv5H4pAHU5PdydrgSNQyPkkSR8c6XfrGHqA@mail.gmail.com> In-Reply-To: <CANCZdfqOb0cKKxV0qUwPK9R%2BA0Dr--s3jWgGd_-8CsD7=dFewg@mail.gmail.com> References: <202301210220.30L2KBQv006863@gitrepo.freebsd.org> <EAE7EA3A-EDF0-44AF-B9B1-25749C39E930@freebsd.org> <CANCZdfqOb0cKKxV0qUwPK9R%2BA0Dr--s3jWgGd_-8CsD7=dFewg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, Jan 20, 2023 at 7:27 PM Warner Losh <imp@bsdimp.com> wrote: > > > On Fri, Jan 20, 2023 at 7:22 PM Jessica Clarke <jrtc27@freebsd.org> wrote: > >> On 21 Jan 2023, at 02:20, Warner Losh <imp@FreeBSD.org> wrote: >> > >> > The branch main has been updated by imp: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=34784d17eb2bcdcfaee39f570bff613b4055912d >> > >> > commit 34784d17eb2bcdcfaee39f570bff613b4055912d >> > Author: Warner Losh <imp@FreeBSD.org> >> > AuthorDate: 2023-01-21 02:15:52 +0000 >> > Commit: Warner Losh <imp@FreeBSD.org> >> > CommitDate: 2023-01-21 02:18:15 +0000 >> > >> > elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h >> > >> > FreeBSD defines EF_ARM_EABI_VERSION in a non-standard way (at least >> > differently than everybody else). We use this only in elf*machdep.c >> to >> > make sure the image is new enough. Switch to the more standard way of >> > defining this and adjust other constants to match. >> > >> > Fixes: c52c98e69a2e >> > Sponsored by: Netflix >> > --- >> > sys/arm/include/elf.h | 3 +-- >> > sys/arm64/arm64/elf32_machdep.c | 3 +-- >> > 2 files changed, 2 insertions(+), 4 deletions(-) >> > >> > diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h >> > index 35d0fa55ca1a..2ea60e8f10ee 100644 >> > --- a/sys/arm/include/elf.h >> > +++ b/sys/arm/include/elf.h >> > @@ -74,9 +74,8 @@ __ElfType(Auxinfo); >> > #define ELF_TARG_VER 1 >> > >> > /* Defines specific for arm headers */ >> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) >> > #define EF_ARM_EABI_VERSION_UNKNOWN 0 >> >> Can also use EF_ARM_EABI_UNKNOWN in its place? >> > > I'm not sure I understand the question... In what's place? > Oh, I see... Yea... We can just delete EF_ARM_EABI_VERSION_UNKNOWN since it's unused. It was added for the OABI -> EABI transition... Warner > Warner > > >> Jess >> >> > -#define EF_ARM_EABI_FREEBSD_MIN 4 >> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 >> > >> > #define ET_DYN_LOAD_ADDR 0x01001000 >> > >> > diff --git a/sys/arm64/arm64/elf32_machdep.c >> b/sys/arm64/arm64/elf32_machdep.c >> > index f637c5a65c05..627973ecfd3d 100644 >> > --- a/sys/arm64/arm64/elf32_machdep.c >> > +++ b/sys/arm64/arm64/elf32_machdep.c >> > @@ -152,8 +152,7 @@ elf32_arm_abi_supported(struct image_params *imgp, >> int32_t *osrel __unused, >> > ID_AA64PFR0_EL0_64_32) >> > return (FALSE); >> > >> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24) >> > -#define EF_ARM_EABI_FREEBSD_MIN 4 >> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 >> > hdr = (const Elf32_Ehdr *)imgp->image_header; >> > if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) { >> > if (bootverbose) >> >> [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jan 20, 2023 at 7:27 PM Warner Losh <<a href="mailto:imp@bsdimp.com">imp@bsdimp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jan 20, 2023 at 7:22 PM Jessica Clarke <<a href="mailto:jrtc27@freebsd.org" target="_blank">jrtc27@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 21 Jan 2023, at 02:20, Warner Losh <imp@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by imp:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=34784d17eb2bcdcfaee39f570bff613b4055912d" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=34784d17eb2bcdcfaee39f570bff613b4055912d</a><br>; > <br> > commit 34784d17eb2bcdcfaee39f570bff613b4055912d<br> > Author: Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2023-01-21 02:15:52 +0000<br> > Commit: Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2023-01-21 02:18:15 +0000<br> > <br> > elf: Catch up with defining EF_ARM_EABI_VERSION in elf_common.h<br> > <br> > FreeBSD defines EF_ARM_EABI_VERSION in a non-standard way (at least<br> > differently than everybody else). We use this only in elf*machdep.c to<br> > make sure the image is new enough. Switch to the more standard way of<br> > defining this and adjust other constants to match.<br> > <br> > Fixes: c52c98e69a2e<br> > Sponsored by: Netflix<br> > ---<br> > sys/arm/include/elf.h | 3 +--<br> > sys/arm64/arm64/elf32_machdep.c | 3 +--<br> > 2 files changed, 2 insertions(+), 4 deletions(-)<br> > <br> > diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h<br> > index 35d0fa55ca1a..2ea60e8f10ee 100644<br> > --- a/sys/arm/include/elf.h<br> > +++ b/sys/arm/include/elf.h<br> > @@ -74,9 +74,8 @@ __ElfType(Auxinfo);<br> > #define ELF_TARG_VER 1<br> > <br> > /* Defines specific for arm headers */<br> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24)<br> > #define EF_ARM_EABI_VERSION_UNKNOWN 0<br> <br> Can also use EF_ARM_EABI_UNKNOWN in its place?<br></blockquote><div><br></div><div>I'm not sure I understand the question... In what's place?</div></div></div></blockquote><div><br></div><div>Oh, I see... Yea... We can just delete EF_ARM_EABI_VERSION_UNKNOWN since it's unused.</div><div>It was added for the OABI -> EABI transition...<br></div><div><br></div><div>Warner<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div>Warner<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Jess<br> <br> > -#define EF_ARM_EABI_FREEBSD_MIN 4<br> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4<br> > <br> > #define ET_DYN_LOAD_ADDR 0x01001000<br> > <br> > diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c<br> > index f637c5a65c05..627973ecfd3d 100644<br> > --- a/sys/arm64/arm64/elf32_machdep.c<br> > +++ b/sys/arm64/arm64/elf32_machdep.c<br> > @@ -152,8 +152,7 @@ elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused,<br> > ID_AA64PFR0_EL0_64_32)<br> > return (FALSE);<br> > <br> > -#define EF_ARM_EABI_VERSION(x) (((x) & EF_ARM_EABIMASK) >> 24)<br> > -#define EF_ARM_EABI_FREEBSD_MIN 4<br> > +#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4<br> > hdr = (const Elf32_Ehdr *)imgp->image_header;<br> > if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) {<br> > if (bootverbose)<br> <br> </blockquote></div></div> </blockquote></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfphY8XLEmi%2Bv5H4pAHU5PdydrgSNQyPkkSR8c6XfrGHqA>