View | Details | Raw Unified | Return to bug 222865
Collapse All | Expand All

(-)files/patch-libpkg_pkg__elf.c (+14 lines)
Line 0 Link Here
1 
--- libpkg/pkg_elf.c.orig	2017-10-08 07:32:25 UTC
2 
+++ libpkg/pkg_elf.c
3 
@@ -665,8 +665,10 @@ aeabi_parse_arm_attributes(void *data, size_t length)
4 
 				/* We have an ARMv4 or ARMv5 */
5 
 				if (val <= 5)
6 
 					return ("arm");
7 
-				else /* We have an ARMv6+ */
8 
+				else if (val == 6) /* We have an ARMv6 */
9 
 					return ("armv6");
10 
+				else /* We have an ARMv7+ */
11 
+					return ("armv7");
12 
 			} else if (tag == 4 || tag == 5 || tag == 32 ||
13 
 			    tag == 65 || tag == 67) {
14 
 				while (*section != '\0' && length != 0)
(-)files/patch-libpkg_private_elf__tables.h (+11 lines)
Line 0 Link Here
1 
--- libpkg/private/elf_tables.h.orig	2017-10-08 07:32:31 UTC
2 
+++ libpkg/private/elf_tables.h
3 
@@ -94,6 +94,8 @@ static struct arch_trans machine_arch_translation[] =
4 
 	{ "arm:32:eb:oabi:softfp", "armeb" },
5 
 	{ "armv6:32:el:eabi:softfp", "armv6" },
6 
 	{ "armv6:32:el:eabi:hardfp", "armv6" },
7 
+	{ "armv7:32:el:eabi:softfp", "armv7" },
8 
+	{ "armv7:32:el:eabi:hardfp", "armv7" },
9 
 	{ "aarch64:64", "aarch64" },
10 
 	/* And now MIPS */
11 
 	{ "mips:32:el:o32", "mipsel" },

Return to bug 222865