Page MenuHomeFreeBSD
Files F169161057

D30540.id.diff
No OneTemporary
Actions

D30540.id.diff
View Options

diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -57,6 +57,8 @@
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_vdso.h>
+#include <machine/md_var.h>
+
#ifdef VFP
#include <machine/vfp.h>
#endif
@@ -169,9 +171,7 @@
issetugid = p->p_flag & P_SUGID ? 1 : 0;
AUXARGS_ENTRY(pos, LINUX_AT_SYSINFO_EHDR,
imgp->proc->p_sysent->sv_shared_page_base);
-#if 0 /* LINUXTODO: implement arm64 LINUX_AT_HWCAP */
- AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, cpu_feature);
-#endif
+ AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, *imgp->sysent->sv_hwcap);
AUXARGS_ENTRY(pos, AT_PAGESZ, args->pagesz);
AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, stclohz);
AUXARGS_ENTRY(pos, AT_PHDR, args->phdr);
@@ -186,6 +186,7 @@
AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid);
AUXARGS_ENTRY(pos, LINUX_AT_SECURE, issetugid);
AUXARGS_ENTRY_PTR(pos, LINUX_AT_RANDOM, imgp->canary);
+ AUXARGS_ENTRY(pos, LINUX_AT_HWCAP2, *imgp->sysent->sv_hwcap2);
if (imgp->execpathp != 0)
AUXARGS_ENTRY_PTR(pos, LINUX_AT_EXECFN, imgp->execpathp);
if (args->execfd != -1)
@@ -437,6 +438,8 @@
.sv_schedtail = linux_schedtail,
.sv_thread_detach = linux_thread_detach,
.sv_trap = linux_vsyscall,
+ .sv_hwcap = &elf_hwcap,
+ .sv_hwcap2 = &elf_hwcap2,
.sv_onexec = linux_on_exec,
.sv_onexit = linux_on_exit,
.sv_ontdexit = linux_thread_dtor,

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 3:30 PM (9 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37804662
Default Alt Text
D30540.id.diff (1 KB)

Event Timeline