From: Chen Qi <[email protected]>

In commit fcac98d0b (linux-user: Remove ELF_HWCAP2), the following
macro is removed:

However, in place of the original ELF_HWCAP2, get_elf_hwcap instead
of the original get_elf_hwcap2 was used.

This caused serious regression for at least ppc64 user mode. The
error message is like below:

  Fatal glibc error: CPU lacks ISA 3.00 support (POWER9 or later required)

This patch restores to use get_elf_hwcap2.

Signed-off-by: Chen Qi <[email protected]>
---
 linux-user/elfload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 0002d5be2f..35471c0c9a 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -708,7 +708,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, 
int envc,
     NEW_AUX_ENT(AT_EXECFN, info->file_string);
 
     if (HAVE_ELF_HWCAP2) {
-        NEW_AUX_ENT(AT_HWCAP2, get_elf_hwcap(thread_cpu));
+        NEW_AUX_ENT(AT_HWCAP2, get_elf_hwcap2(thread_cpu));
     }
     if (u_base_platform) {
         NEW_AUX_ENT(AT_BASE_PLATFORM, u_base_platform);
-- 
2.34.1


Reply via email to