| 1 |
From 72f4b70e8e8e656d88bda77605f73076474f5a55 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Marek Vasut <[email protected]> |
| 3 |
Date: Sat, 9 Nov 2024 11:43:05 +0100 |
| 4 |
Subject: [PATCH 017/159] fix(rcar-layout): fix tool build |
| 5 |
|
| 6 |
Since 2f1c5e7eb177 ("build: use GCC to link by default") the |
| 7 |
code does not even compile with GCC14 on debian/unstable with |
| 8 |
the following error: |
| 9 |
|
| 10 |
/usr/lib/gcc-cross/aarch64-linux-gnu/14/../../../../aarch64-linux-gnu/bin/ld: bootparam_sa0.elf: error: PHDR segment not covered by LOAD segment |
| 11 |
/usr/lib/gcc-cross/aarch64-linux-gnu/14/../../../../aarch64-linux-gnu/bin/ld: cert_header_sa6.elf: error: PHDR segment not covered by LOAD segment |
| 12 |
|
| 13 |
Fix the tools build. |
| 14 |
|
| 15 |
Signed-off-by: Marek Vasut <[email protected]> |
| 16 |
Change-Id: I830b53e23f25c62da3583c1c3e02e0607a237d15 |
| 17 |
--- |
| 18 |
tools/renesas/rcar_layout_create/makefile | 4 ++-- |
| 19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/tools/renesas/rcar_layout_create/makefile b/tools/renesas/rcar_layout_create/makefile |
| 22 |
index 7a64b1908..f89f379e9 100644 |
| 23 |
--- a/tools/renesas/rcar_layout_create/makefile |
| 24 |
+++ b/tools/renesas/rcar_layout_create/makefile |
| 25 |
@@ -102,7 +102,7 @@ $(FILE_NAME_SA0).bin: $(OUTPUT_FILE_SA0) | $$(@D)/ |
| 26 |
$(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA0) $(FILE_NAME_SA0).bin |
| 27 |
|
| 28 |
$(OUTPUT_FILE_SA0): $(MEMORY_DEF_SA0) $(OBJ_FILE_SA0) | $$(@D)/ |
| 29 |
- $(aarch64-ld) $(OBJ_FILE_SA0) -nostdlib -T $(MEMORY_DEF_SA0) -o $(OUTPUT_FILE_SA0) -Wl,-Map $(FILE_NAME_SA0).map |
| 30 |
+ $(aarch64-ld) $(OBJ_FILE_SA0) -nostdlib -static -Wl,--build-id=none -T $(MEMORY_DEF_SA0) -o $(OUTPUT_FILE_SA0) -Wl,-Map $(FILE_NAME_SA0).map |
| 31 |
|
| 32 |
$(FILE_NAME_SA6).srec: $(OUTPUT_FILE_SA6) | $$(@D)/ |
| 33 |
$(aarch64-oc) -O srec --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).srec |
| 34 |
@@ -111,7 +111,7 @@ $(FILE_NAME_SA6).bin: $(OUTPUT_FILE_SA6) | $$(@D)/ |
| 35 |
$(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).bin |
| 36 |
|
| 37 |
$(OUTPUT_FILE_SA6): $(MEMORY_DEF_SA6) $(OBJ_FILE_SA6) | $$(@D)/ |
| 38 |
- $(aarch64-ld) $(OBJ_FILE_SA6) -nostdlib -T $(MEMORY_DEF_SA6) -o $(OUTPUT_FILE_SA6) -Wl,-Map $(FILE_NAME_SA6).map |
| 39 |
+ $(aarch64-ld) $(OBJ_FILE_SA6) -nostdlib -static -Wl,--build-id=none -T $(MEMORY_DEF_SA6) -o $(OUTPUT_FILE_SA6) -Wl,-Map $(FILE_NAME_SA6).map |
| 40 |
|
| 41 |
################################################### |
| 42 |
# Compile |
| 43 |
-- |
| 44 |
2.39.5 |
| 45 |
|