diff options
| author | Jessica Clarke <jrtc27@jrtc27.com> | 2021-03-20 20:43:05 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-21 12:54:13 -0400 |
| commit | c030d58cc4fa647514f2993a7cd3a1e0b797cc21 (patch) | |
| tree | 16b8b5b79113a9835700a0ce7a97f343e8f87ffd | |
| parent | 1f9c3f13f6ad8595a0fb5ab2cb830583cdc0b60a (diff) | |
| download | u-boot-WIP/Check-host-tools.zip u-boot-WIP/Check-host-tools.tar.gz u-boot-WIP/Check-host-tools.tar.bz2 | |
Support building on macOS/arm64WIP/Check-host-tools
On Arm-based Macs, -no_pie is ignored and gives a linker warning.
Moreover, the build falls over with:
ld: Absolute addressing not allowed in arm64 code but used in '_image_type_ptr_aisimage' referencing '_image_type_aisimage'
for dumpimage and mkimage, since we put data structs in text sections
not data sections and so cannot have dynamic relocations. Instead, move
the sections to __DATA and drop disabling PIE.
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | tools/imagetool.h | 4 |
2 files changed, 2 insertions, 7 deletions
@@ -324,11 +324,6 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") -# since Lion (10.7) ASLR is on by default, but we use linker generated lists -# in some host tools which is a problem then ... so disable ASLR for these -# tools -KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") - # macOS Mojave (10.14.X) # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") diff --git a/tools/imagetool.h b/tools/imagetool.h index 8726792..2801ea9 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -273,14 +273,14 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ - char *__cat(pstart_, name) = getsectdata("__TEXT", \ + char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ __cat(__stop_, name) = (void *)__cat(pstop_, name); \ } while (0) -#define SECTION(name) __attribute__((section("__TEXT, " #name))) +#define SECTION(name) __attribute__((section("__DATA, " #name))) struct image_type_params **__start_image_type, **__stop_image_type; #else |