ArmPkg: Include: Add CLANGPDB Support in Assembly Macros

The change will guard the CLANG-unsupported directives outside of the __clang__ macro define. This change does not have functional change other than minimal section literals. Signed-off-by: Kun Qin <kun.qin@microsoft.com>
microsoft · Jun 5, 2024 · 40a19d1 · 40a19d1
1 parent 8f20fe3
commit 40a19d1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
@@ -12,12 +12,22 @@
 #ifndef ASM_MACRO_IO_LIB_H_
 #define ASM_MACRO_IO_LIB_H_
 
+#ifndef __clang__ // MU_CHANGE
 #define _ASM_FUNC(Name, Section)    \
   .global   Name                  ; \
   .section  #Section, "ax"        ; \
   .type     Name, %function       ; \
   .p2align  2                     ; \
   Name:
+// MU_CHANGE Starts: CLANGPDB support
+#else
+#define _ASM_FUNC(Name, Section)    \
+  .global   Name                  ; \
+  .section  #Section, "ax"        ; \
+  .p2align  2                     ; \
+  Name:
+#endif
+// MU_CHANGE Ends
 
 #define ASM_FUNC(Name)  _ASM_FUNC(ASM_PFX(Name), .text. ## Name)
 

diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h
@@ -103,20 +103,41 @@ bgt    %b6                  __CR__ \
 
 #if !defined (_MSC_VER)
 
+#ifndef __clang__ // MU_CHANGE
 #define _ASM_FUNC(Name, Section)    \
   .global   Name                  ; \
   .section  #Section, "ax"        ; \
   .type     Name, %function       ; \
   Name:                           ; \
   AARCH64_BTI(c)
+// MU_CHANGE Starts: CLANGPDB support
+#else
+#define _ASM_FUNC(Name, Section)    \
+  .global   Name                  ; \
+  .section  #Section, "ax"        ; \
+  Name:                           ; \
+  AARCH64_BTI(c)
+#endif
+// MU_CHANGE Ends
 
+#ifndef __clang__ // MU_CHANGE
 #define _ASM_FUNC_ALIGN(Name, Section, Align)       \
   .global   Name                                  ; \
   .section  #Section, "ax"                        ; \
   .type     Name, %function                       ; \
   .balign   Align                                 ; \
   Name:                                           ; \
   AARCH64_BTI(c)
+// MU_CHANGE Starts: CLANGPDB support
+#else
+#define _ASM_FUNC_ALIGN(Name, Section, Align)       \
+  .global   Name                                  ; \
+  .section  #Section, "ax"                        ; \
+  .balign   Align                                 ; \
+  Name:                                           ; \
+  AARCH64_BTI(c)
+#endif
+// MU_CHANGE Ends
 
 #define ASM_FUNC(Name)  _ASM_FUNC(ASM_PFX(Name), .text. ## Name)
 

diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
@@ -139,9 +139,18 @@
 #define VECTOR_ENTRY(tbl, off)    \
   .org off
 
+#ifndef __clang__ // MU_CHANGE
 #define VECTOR_END(tbl)           \
   .org 0x800;                     \
   .previous
+// MU_CHANGE Starts: CLANGPDB support
+#else
+#define VECTOR_END(tbl)           \
+  .org 0x800;                     \
+  .section .text.##tbl##,"ax";    \
+  .align 3
+#endif
+// MU_CHANGE Ends
 
 #else