From 4bfd65a2b73eb65c2bc203cd01d2e70bae543531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 30 Jun 2020 18:05:42 +0200
Subject: [PATCH] system/boot: Fix relocations in ARM EFI loader

The .rel.* sections were forgotten in the PE binary, so we just put them in a single .rel

Change-Id: I7bc564e18ec8dd64410b43106272ee74696c2883
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2973
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
---
 src/system/ldscripts/arm/boot_loader_efi.ld | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/system/ldscripts/arm/boot_loader_efi.ld b/src/system/ldscripts/arm/boot_loader_efi.ld
index 22a734a84a..491f8490b4 100644
--- a/src/system/ldscripts/arm/boot_loader_efi.ld
+++ b/src/system/ldscripts/arm/boot_loader_efi.ld
@@ -43,10 +43,16 @@ SECTIONS
    _bss_end = .;
   }
 
-  .rel.dyn : { *(.rel.dyn) }
-  .rel.plt : { *(.rel.plt) }
-  .rel.got : { *(.rel.got) }
-  .rel.data : { *(.rel.data) *(.rel.data*) }
+  .rel :
+  {
+   *(.rel.text) *(.rel.text*)
+   *(.rel.init_array)
+   *(.rel.fini_array)
+   *(.rel.dyn)
+   *(.rel.plt)
+   *(.rel.got)
+   *(.rel.data) *(.rel.data*)
+  }
   _edata = .;
   _data_size = . - _etext;