7ef0631 Fix ABI detection on ARM — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix ABI detection on ARM

Andrew Turner committed 12 years ago

commit 7ef06316527ac2b5cae6e093825b27b8f4ce3685
parent b529cbc

1 file changed +22 -4

modified libpkg/pkg_elf.c

@@ -477,7 +477,7 @@ pkg_get_myarch(char *dest, size_t sz)

 	uint32_t version = 0;
 	int ret = EPKG_OK;
 	int i;
 	const char *abi, *endian_corres_str, *wordsize_corres_str;
 	const char *abi, *endian_corres_str, *wordsize_corres_str, *fpu;
 	if (elf_version(EV_CURRENT) == EV_NONE) {
 		pkg_emit_error("ELF library initialization failed: %s",

@@ -562,10 +562,28 @@ pkg_get_myarch(char *dest, size_t sz)

 		endian_corres_str = elf_corres_to_string(endian_corres,
 		    (int)elfhdr.e_ident[EI_DATA]);
 		/* FreeBSD doesn't support the hard-float ABI yet */
 		fpu = "softfp";
 		if ((elfhdr.e_flags & 0xFF000000) != 0) {
 			/* This is an EABI file, the conformance level is set */
 			abi = "eabi";
 		} else if (elfhdr.e_ident[EI_OSABI] != ELFOSABI_NONE) {
 			/*
 			 * EABI executables all have this field set to
 			 * ELFOSABI_NONE, therefore it must be an oabi file.
 			 */
 			abi = "oabi";
                 } else {
 			/*
 			 * We may have failed to positively detect the ABI,
 			 * set the ABI to unknown. If we end up here one of
 			 * the above cases should be fixed for the binary.
 			 */
 			pkg_emit_error("unknown ARM ABI");
 			goto cleanup;
 		}
 		snprintf(dest + strlen(dest), sz - strlen(dest), ":%s:%s:%s",
 		    endian_corres_str,
 		    (elfhdr.e_flags & EF_ARM_NEW_ABI) > 0 ? "eabi" : "oabi",
 		    (elfhdr.e_flags & EF_ARM_VFP_FLOAT) > 0 ? "softfp" : "vfp");
 		    endian_corres_str, abi, fpu);
 		break;
 	case EM_MIPS:
 		/*