Rename the macros to extract a single arm64 ID field.

Because of the previous naming scheme the old ID_AA64PFR0_EL1 macro collided with a potential macro for the register of the same name. To fix this collision rename these macros. Sponsored by: DARPA, AFRL
freebsd · Oct 30, 2019 · d4cdc59 · d4cdc59
1 parent 3d40147
commit d4cdc59
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 59 deletions.
diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c
@@ -130,7 +130,7 @@ elf32_arm_abi_supported(struct image_params *imgp)
 	const Elf32_Ehdr *hdr;
 
 	/* Check if we support AArch32 */
-	if (ID_AA64PFR0_EL0(READ_SPECIALREG(id_aa64pfr0_el1)) !=
+	if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) !=
 	    ID_AA64PFR0_EL0_64_32)
 		return (FALSE);