[ros-diffs] [reactos] 02/04: [FREELDR/x64] Partly revert 5367ae576083f18c0fbdf0c1e6954c0bb1b47845

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05fbfb0cadf10d726e2f1…

commit 05fbfb0cadf10d726e2f136bdb13a097f5059d26
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Mon Feb 22 10:30:51 2021 +0100
Commit:     Hervé Poussineau <hpoussin(a)reactos.org>
CommitDate: Mon Feb 22 14:21:43 2021 +0100

    [FREELDR/x64] Partly revert 5367ae576083f18c0fbdf0c1e6954c0bb1b47845
    
    Using RealModeEntryPoint uses IMAGE_REL_I386_REL16, now supported by obj2bin
---
 boot/freeldr/freeldr/arch/realmode/amd64.S | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S
b/boot/freeldr/freeldr/arch/realmode/amd64.S
index c13c2e805e3..a45f9092364 100644
--- a/boot/freeldr/freeldr/arch/realmode/amd64.S
+++ b/boot/freeldr/freeldr/arch/realmode/amd64.S
@@ -77,11 +77,7 @@ Msg_LongModeSupported:
     call BuildPageTables
 
     /* Store real mode entry point in shared memory */
-#ifdef _USE_ML
     mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint
-#else
-    mov dword ptr ds:[BSS_RealModeEntry], (FREELDR_BASE + RealModeEntryPoint - (Startup -
512))
-#endif
 
     /* Address the image with es segment */
     mov ax, FREELDR_PE_BASE / 16
@@ -124,11 +120,7 @@ gdt:
 /* GDT table pointer */
 gdtptr:
     .word HEX(37)       /* Limit */
-#ifdef _USE_ML
-    .long offset gdt    /* Base Address */
-#else
-    .long (FREELDR_BASE + gdt - (Startup - 512))   /* Base Address */
-#endif
+    .long gdt           /* Base Address */
 
 
 CheckFor64BitSupport: