From c5d3ca339cb067de19f5e789d7668f9b8ec40ee7 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 21 Mar 2022 19:18:35 +0100 Subject: [PATCH] runtime_loader: ignore PT_ARM_UNWIND sections Change-Id: I966e366c73d495c3b3396f0dd4b44bafaf5c77c5 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5136 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- src/system/runtime_loader/elf_load_image.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/system/runtime_loader/elf_load_image.cpp b/src/system/runtime_loader/elf_load_image.cpp index 32f8cb6a26..928fe229b6 100644 --- a/src/system/runtime_loader/elf_load_image.cpp +++ b/src/system/runtime_loader/elf_load_image.cpp @@ -85,6 +85,9 @@ count_regions(const char* imagePath, char const* buff, int phnum, int phentsize) case PT_TLS: // will be handled at some other place break; + case PT_ARM_UNWIND: + // will be handled in libgcc_s.so.1 + break; default: FATAL("%s: Unhandled pheader type in count 0x%" B_PRIx32 "\n", imagePath, pheaders->p_type); @@ -213,6 +216,9 @@ parse_program_headers(image_t* image, char* buff, int phnum, int phentsize) TLSBlockTemplate((void*)pheader->p_vaddr, pheader->p_filesz, pheader->p_memsz)); break; + case PT_ARM_UNWIND: + // will be handled in libgcc_s.so.1 + break; default: FATAL("%s: Unhandled pheader type in parse 0x%" B_PRIx32 "\n", image->path, pheader->p_type);