On Fri, Oct 8, 2021 at 6:15 PM Warner Losh <i...@bsdimp.com> wrote: > > All architectures have a ELF_HWCAP, so remove the fallback ifdef. > Place ELF_HWCAP in the same order as on native FreeBSD. > > Signed-off-by: Warner Losh <i...@bsdimp.com> > Reviewed-by: Richard Henderson <richard.hender...@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > bsd-user/freebsd/target_os_elf.h | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/bsd-user/freebsd/target_os_elf.h > b/bsd-user/freebsd/target_os_elf.h > index 2d03a883aa..adcffd1ddb 100644 > --- a/bsd-user/freebsd/target_os_elf.h > +++ b/bsd-user/freebsd/target_os_elf.h > @@ -38,10 +38,6 @@ > #define ELF_PLATFORM (NULL) > #endif > > -#ifndef ELF_HWCAP > -#define ELF_HWCAP 0 > -#endif > - > /* XXX Look at the other conflicting AT_* values. */ > #define FREEBSD_AT_NCPUS 19 > #define FREEBSD_AT_HWCAP 25 > @@ -114,12 +110,12 @@ static abi_ulong target_create_elf_tables(abi_ulong p, > int argc, int envc, > NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0); > NEW_AUX_ENT(FREEBSD_AT_NCPUS, (abi_ulong)bsd_get_ncpu()); > NEW_AUX_ENT(AT_ENTRY, load_bias + exec->e_entry); > + features = ELF_HWCAP; > + NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); > NEW_AUX_ENT(AT_UID, (abi_ulong)getuid()); > NEW_AUX_ENT(AT_EUID, (abi_ulong)geteuid()); > NEW_AUX_ENT(AT_GID, (abi_ulong)getgid()); > NEW_AUX_ENT(AT_EGID, (abi_ulong)getegid()); > - features = ELF_HWCAP; > - NEW_AUX_ENT(FREEBSD_AT_HWCAP, features); > target_auxents = sp; /* Note where the aux entries are in the target > */ > #ifdef ARCH_DLINFO > /* > -- > 2.32.0 >
Reviewed-by: Kyle Evans <kev...@freebsd.org>
