On 8/7/21 11:42 AM, Warner Losh wrote:
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -19,48 +19,14 @@
  #ifndef_TARGET_ARCH_ELF_H_
  #define_TARGET_ARCH_ELF_H_
-#define ELF_PLATFORM get_elf_platform()
-
-static const char *get_elf_platform(void)
-{
-    static char elf_platform[] = "i386";
-    int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
-    if (family > 6) {
-        family = 6;
-    }
-    if (family >= 3) {
-        elf_platform[1] = '0' + family;
-    }
-    return elf_platform;
-}
-
-#define ELF_HWCAP get_elf_hwcap()
-
-static uint32_t get_elf_hwcap(void)
-{
-    X86CPU *cpu = X86_CPU(thread_cpu);
-
-    return cpu->env.features[FEAT_1_EDX];
-}
-
  #define ELF_START_MMAP 0x2aaaaab000ULL
-#define elf_check_arch(x) (((x) == ELF_ARCH))
+#define ELF_ET_DYN_LOAD_ADDR    0x01021000
+#define elf_check_arch(x) ( ((x) == ELF_ARCH) )

This appears to be unrelated? Should this have been in a previous patch? Or is this a rebase mistake that gets corrected later?

I'll trust the target_os_thread.h thing becomes useful later.
So, modulo the target_arch_elf.h weirdness,

Reviewed-by: Richard Henderson <richard.hender...@linaro.org>

r~

Reply via email to