From ce3b94e86e2f2692d6a88303ec99b48998b76a9a Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Wed, 26 Jul 2023 02:59:30 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=202/2=20for=20objcopy?=
 =?UTF-8?q?=20unaligned=20sections=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This one restores rust-objcopy but explicitly aligns
the beginning of each section. This avoids incorrect
binary output (.rodata section was offset 10-12 bytes
because of unaligned section start).
---
 Makefile.toml     | 5 ++++-
 linker/aarch64.ld | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index 7dae614..849eafa 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -50,7 +50,10 @@ PLATFORM_TARGET="--target=${TARGET_JSON} --features=${TARGET_FEATURES}"
 DEVICE_FEATURES = "noserial"
 QEMU_FEATURES = "qemu,rpi3"
 
-OBJCOPY = "/opt/homebrew/Cellar/aarch64-elf-binutils/2.40/bin/aarch64-elf-objcopy" # Part of `cargo objcopy` in cargo-binutils
+# Working objcopy from `brew install aarch64-elf-binutils`
+#OBJCOPY = "/opt/homebrew/Cellar/aarch64-elf-binutils/2.40/bin/aarch64-elf-objcopy" # Part of `cargo objcopy` in cargo-binutils
+# LLVM's objcopy, usually full of bugs like https://github.com/llvm/llvm-project/issues/58407
+OBJCOPY = "rust-objcopy" # Part of `cargo objcopy` in cargo-binutils
 OBJCOPY_PARAMS = "--strip-all -O binary"
 NM = "rust-nm" # Part of `cargo nm` in cargo-binutils
 
diff --git a/linker/aarch64.ld b/linker/aarch64.ld
index 17fdb92..f1ed3f8 100644
--- a/linker/aarch64.ld
+++ b/linker/aarch64.ld
@@ -59,14 +59,16 @@ SECTIONS
         *(.text*)
     } :segment_code
 
-    .vectors ALIGN(2048):
+    .vectors :
     {
+        . = ALIGN(2048);
         __EXCEPTION_VECTORS_START = .;
         KEEP(*(.vectors))
     } :segment_code
 
-    .rodata ALIGN(4):
+    .rodata :
     {
+        . = ALIGN(4);
         *(.rodata*)
         FILL(0x00)
         . = ALIGN(PAGE_SIZE); /* Fill up to page size */
@@ -84,8 +86,9 @@ SECTIONS
         FILL(0x00)
     } :segment_data
 
-    .bss ALIGN(PAGE_SIZE) (NOLOAD):
+    .bss (NOLOAD):
     {
+        . = ALIGN(PAGE_SIZE);
         __BSS_START = .;
         *(.bss*)
         . = ALIGN(PAGE_SIZE); /* Align up to page size */