mkimage segfaults due to the ASLR mechanism on MacOS arm64 It is required to use _dyld_get_image_vmaddr_slide() to prevent segfault on MacOS arm64
This patch is based on the discussion https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0 Thanks to Jessica Clarke, Ronny Kotzschmar and ptpt52 github user Reviewed-by: Jessica Clarke <[email protected]> Signed-off-by: Sergey V. Lobanov <[email protected]> --- Changes since version 2: - Rebased on current master - Added Reviewed-by tag - Fixed typos and grammatical errors tools/imagetool.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/imagetool.h b/tools/imagetool.h index b7ac3a23d0..45eaada4b5 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -272,11 +272,13 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); * b) we need a API call to get the respective section symbols */ #if defined(__MACH__) #include <mach-o/getsect.h> +#include <mach-o/dyld.h> #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ + __cat(pstart_, name) += _dyld_get_image_vmaddr_slide(0);\ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ -- 2.32.0 (Apple Git-132)
