5e0989c recognize armv7 — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

recognize armv7

Steve Wills committed 8 years ago

commit 5e0989c718626c5443a45480d838526d6b5ddb82
parent cc27c8c

2 files changed +5 -1

modified libpkg/pkg_elf.c

@@ -669,8 +669,10 @@ aeabi_parse_arm_attributes(void *data, size_t length)

 				/* We have an ARMv4 or ARMv5 */
 				if (val <= 5)
 					return ("arm");
 				else /* We have an ARMv6+ */
 				else if (val == 6) /* We have an ARMv6 */
 					return ("armv6");
 				else /* We have an ARMv7+ */
 					return ("armv7");
 			} else if (tag == 4 || tag == 5 || tag == 32 ||
 			    tag == 65 || tag == 67) {
 				while (*section != '\0' && length != 0)

modified libpkg/private/elf_tables.h

@@ -95,6 +95,8 @@ static struct arch_trans machine_arch_translation[] = {

 	{ "arm:32:eb:oabi:softfp", "armeb" },
 	{ "armv6:32:el:eabi:softfp", "armv6" },
 	{ "armv6:32:el:eabi:hardfp", "armv6" },
 	{ "armv7:32:el:eabi:softfp", "armv7" },
 	{ "armv7:32:el:eabi:hardfp", "armv7" },
 	{ "aarch64:64", "aarch64" },
 	/* And now MIPS */
 	{ "mips:32:el:o32", "mipsel" },