[PATCH v6 12/21] arm64:ilp32: share HWCAP between LP64 and ILP32

Arnd Bergmann
2016-01-08T08:58:00Z

On Friday 08 January 2016 02:34:30 Yury Norov wrote:
> #define ELF_HWCAP (elf_hwcap)
>
> #ifdef CONFIG_COMPAT
> -#define COMPAT_ELF_HWCAP (compat_elf_hwcap)
> -#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2)
> extern unsigned int compat_elf_hwcap, compat_elf_hwcap2;
> +#define COMPAT_ELF_HWCAP \
> + (is_a32_compat_task() \
> + ? compat_elf_hwcap \
> + : (u32) elf_hwcap)
> +
> +#define COMPAT_ELF_HWCAP2 \
> + (is_a32_compat_task() \
> + ? compat_elf_hwcap2 \
> + : (u32) (elf_hwcap >> 32))
> +
> #endif
>
>

This should no longer be needed after patch 11: just define the ELF_HWCAP
and ELF_HWCAP2 values for the right mode when including fs/binfmt_elf.c.
You know what it should be at build time, so don't bother doing a runtime
check.

Arnd