From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: "Kyle Evans" <kevans@FreeBSD.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Warner Losh" <imp@bsdimp.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 17/23] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder
Date: Mon, 18 Oct 2021 10:04:52 -0600 [thread overview]
Message-ID: <20211018160458.1976-18-imp@bsdimp.com> (raw)
In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com>
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 <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Kyle Evans <kevans@FreeBSD.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
next prev parent reply other threads:[~2021-10-18 16:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 16:04 [PULL 00/23] Pull bsd user 20211018 patches Warner Losh
2021-10-18 16:04 ` [PULL 01/23] bsd-user/mmap.c: Always zero MAP_ANONYMOUS memory in mmap_frag() Warner Losh
2021-10-18 16:04 ` [PULL 02/23] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE Warner Losh
2021-10-18 16:04 ` [PULL 03/23] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs Warner Losh
2021-10-18 16:04 ` [PULL 04/23] bsd-user/mmap.c: mmap return ENOMEM on overflow Warner Losh
2021-10-18 16:04 ` [PULL 05/23] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD Warner Losh
2021-10-18 16:04 ` [PULL 06/23] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging Warner Losh
2021-10-18 16:04 ` [PULL 07/23] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag Warner Losh
2021-10-18 18:45 ` Richard Henderson
2021-10-18 18:47 ` Warner Losh
2021-10-18 18:48 ` Richard Henderson
2021-10-18 16:04 ` [PULL 08/23] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head Warner Losh
2021-10-18 16:04 ` [PULL 09/23] bsd-user/mmap.c: assert that target_mprotect cannot fail Warner Losh
2021-10-18 16:04 ` [PULL 10/23] meson: *-user: only descend into *-user when configured Warner Losh
2021-10-18 16:04 ` [PULL 11/23] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0 Warner Losh
2021-10-18 16:04 ` [PULL 12/23] bsd-user/strace.list: Remove support for FreeBSD versions " Warner Losh
2021-10-18 16:04 ` [PULL 13/23] bsd-user: TARGET_RESET define is unused, remove it Warner Losh
2021-10-18 16:04 ` [PULL 14/23] bsd-user: export get_errno and is_error from syscall.c Warner Losh
2021-10-18 16:04 ` [PULL 15/23] bsd-user/errno_defs.h: Add internal error numbers Warner Losh
2021-10-18 16:04 ` [PULL 16/23] bsd-user: move TARGET_MC_GET_CLEAR_RET to target_os_signal.h Warner Losh
2021-10-18 16:04 ` Warner Losh [this message]
2021-10-18 16:04 ` [PULL 18/23] bsd-user/target_os_elf: If ELF_HWCAP2 is defined, publish it Warner Losh
2021-10-18 16:04 ` [PULL 19/23] bsd-user: Remove used from TaskState Warner Losh
2021-10-18 16:04 ` [PULL 20/23] bsd-user: Add stop_all_tasks Warner Losh
2021-10-18 16:04 ` [PULL 21/23] bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface Warner Losh
2021-10-18 16:04 ` [PULL 22/23] bsd-user: Rename sigqueue to qemu_sigqueue Warner Losh
2021-10-18 16:04 ` [PULL 23/23] bsd-user/signal: Create a dummy signal queueing function Warner Losh
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=20211018160458.1976-18-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=f4bug@amsat.org \
--cc=kevans@FreeBSD.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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 NNTP newsgroup(s).