From 901cd2704c0fb2d10ccc3c6f64c27bd5da9edbc3 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 22 Oct 2024 11:09:00 +0300
Subject: [PATCH] [ASM] macamd64.inc: Fix up entry point macros a bit

This is the minimal version to be compatible with GAS. Code segment and NoPad could probably be added later, but they are not strictly required.
---
 sdk/include/asm/asm.inc      |  1 +
 sdk/include/asm/macamd64.inc | 54 ++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc
index b1a29b8802e..51ec68d03c7 100644
--- a/sdk/include/asm/asm.inc
+++ b/sdk/include/asm/asm.inc
@@ -317,6 +317,7 @@ ENDM
 
 /* MASM compatible ALIGN */
 #define ALIGN .align
+#define align .align
 
 /* MASM compatible REPEAT, additional ENDR */
 #define REPEAT .rept
diff --git a/sdk/include/asm/macamd64.inc b/sdk/include/asm/macamd64.inc
index af917f54f31..e8cdfe04335 100644
--- a/sdk/include/asm/macamd64.inc
+++ b/sdk/include/asm/macamd64.inc
@@ -75,52 +75,52 @@ MACRO(BEGIN_EPILOGUE)
 ENDM
 
 MACRO(LEAF_ENTRY, Name, Section, NoPad)
-    Section segment para 'CODE'
-    ifb <NoPad>
-        db 6 dup HEX(CC)
-    endif
+//Section segment para 'CODE'
+//ifb <NoPad>
+//    db 6 dup (0cch)
+//endif
     align 16
-    public  Name
-Name    proc    frame
+    public Name
+.PROC Name
     END_PROLOGUE
 ENDM
 
 MACRO(LEAF_ENTRY_ARG1, Name, Section, Arg1, NoPad)
-    Section segment para 'CODE'
-    ifb <NoPad>
-        db 6 dup HEX(CC)
-    endif
+//Section segment para 'CODE'
+//ifb <NoPad>
+//    db 6 dup (0cch)
+//endif
     align 16
-    public  Name
-Name    proc    frame
+    public Name
+.PROC Name
     END_PROLOGUE
 ENDM
 
 MACRO(LEAF_ENTRY_ARG2, Name, Section, Arg1, Arg2, NoPad)
-    Section segment para 'CODE'
-    ifb <NoPad>
-        db 6 dup HEX(CC)
-    endif
+//Section segment para 'CODE'
+//ifb <NoPad>
+//    db 6 dup (0cch)
+//endif
     align 16
-    public  Name
-Name    proc    frame
+    public Name
+.PROC Name
     END_PROLOGUE
 ENDM
 
 MACRO(LEAF_ENTRY_ARG3, Name, Section, Arg1, Arg2, Arg3, NoPad)
-    Section segment para 'CODE'
-    ifb <NoPad>
-        db 6 dup HEX(CC)
-    endif
+//Section segment para 'CODE'
+//ifb <NoPad>
+//    db 6 dup (0cch)
+//endif
     align 16
-    public  Name
-Name    proc    frame
+    public Name
+.PROC Name
     END_PROLOGUE
 ENDM
 
-MACRO(LEAF_END, Name, section)
-    Name    endp
-    Section ends
+MACRO(LEAF_END, Name, Section)
+.ENDP
+//Section ends
 ENDM
 
 MACRO(NESTED_ENTR, Name, Section, Handler, NoPad)