From dbf90dbd2ade0aa0f442e79cebb820f2e5e4f04b Mon Sep 17 00:00:00 2001
From: Download-Fritz <download-fritz@outlook.com>
Date: Fri, 22 Mar 2019 11:50:32 +0100
Subject: [PATCH] OcAppleKernelLib: Treat scattered relocs as normal ones, as
 done in KXLD. Check relocation skipability earlier.

---
 Library/OcAppleKernelLib/Link.c | 42 ++++++++++-----------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/Library/OcAppleKernelLib/Link.c b/Library/OcAppleKernelLib/Link.c
index 084338cf..dea322e2 100644
--- a/Library/OcAppleKernelLib/Link.c
+++ b/Library/OcAppleKernelLib/Link.c
@@ -464,13 +464,6 @@ InternalCalculateTargetsIntel64 (
   //
   TargetAddress = LoadAddress;
 
-  //
-  // Assertion: Scattered Relocations are only supported by i386.
-  //
-  if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
-    DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
-  }
-
   if (Relocation->Extern != 0) {
     Symbol = MachoGetSymbolByIndex64 (
                 MachoContext,
@@ -633,26 +626,11 @@ InternalRelocateRelocationIntel64 (
 
   ASSERT (RelocationBase != 0);
   ASSERT (Relocation != NULL);
-  //
-  // Scattered Relocations are only supported by i386.
-  //
-  if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
-    DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
-  }
 
   IsPair        = FALSE;
   Adjustment    = 0;
   IsNormalLocal = FALSE;
 
-  if ((Relocation->Extern == 0)
-   && (Relocation->SymbolNumber == MACH_RELOC_ABSOLUTE)) {
-    //
-    // A section-based relocation entry can be skipped for absolute 
-    // symbols.
-    //
-    return 0;
-  }
-
   Address    = Relocation->Address;
   Length     = Relocation->Size;
   Type       = (UINT8)Relocation->Type;
@@ -901,6 +879,19 @@ InternalRelocateAndCopyRelocations64 (
   PreservedRelocations = 0;
 
   for (Index = 0; Index < *NumRelocations; ++Index) {
+    //
+    // Assertion: Not i386.  Scattered Relocations are only supported by i386.
+    //            && ((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) == 0
+    //
+    if ((SourceRelocations[Index].Extern == 0)
+     && (SourceRelocations[Index].SymbolNumber == MACH_RELOC_ABSOLUTE)) {
+      //
+      // A section-based relocation entry can be skipped for absolute 
+      // symbols.
+      //
+      continue;
+    }
+
     NextRelocation = &SourceRelocations[Index + 1];
     //
     // The last Relocation does not have a successor.
@@ -928,13 +919,6 @@ InternalRelocateAndCopyRelocations64 (
     if ((Result & ~(UINTN)BIT31) != 0) {
       Relocation = &TargetRelocations[PreservedRelocations];
 
-      //
-      // Assertion: Scattered Relocations are only supported by i386.
-      //
-      if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
-        DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
-      }
-
       CopyMem (Relocation, &SourceRelocations[Index], sizeof (*Relocation));
 
       if (Relocation->Extern != 0) {