D42639.id130217.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D42639.id130217.diff
View Options

	diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c
	--- a/sys/arm64/arm64/elf32_machdep.c
	+++ b/sys/arm64/arm64/elf32_machdep.c
	@@ -153,8 +153,16 @@
	.header_supported= elf32_arm_abi_supported,
	};

	-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST,
	- (sysinit_cfunc_t)elf32_insert_brand_entry, &freebsd32_brand_info);
	+static void
	+register_elf32_brand(void *arg)
	+{
	+ /* Check if we support AArch32 */
	+ if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) ==
	+ ID_AA64PFR0_EL0_64_32) {
	+ elf32_insert_brand_entry(&freebsd32_brand_info);
	+ }
	+}
	+SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, register_elf32_brand, NULL);

	static bool
	elf32_arm_abi_supported(struct image_params imgp, int32_t osrel __unused,
	@@ -162,11 +170,6 @@
	{
	const Elf32_Ehdr *hdr;

	- /* Check if we support AArch32 */
	- if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) !=
	- ID_AA64PFR0_EL0_64_32)
	- return (false);
	-
	#define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4
	hdr = (const Elf32_Ehdr *)imgp->image_header;
	if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) {