Refactor the DBG_CheckStackAlignment support to be more consistent with the rest...

diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index 9401e00..52bbd61 100644 (file)
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(include)
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   add_definitions(-D_TARGET_MAC64)
   set(PLATFORM_SOURCES
-    arch/i386/context.clang.s
+    arch/i386/context.S
     arch/i386/dispatchexceptionwrapper.S
     exception/machexception.cpp
     exception/machmessage.cpp

diff --git a/src/pal/src/arch/i386/context.clang.s b/src/pal/src/arch/i386/context.S
similarity index 100%
rename from src/pal/src/arch/i386/context.clang.s
rename to src/pal/src/arch/i386/context.S

diff --git a/src/pal/src/arch/i386/context.cpp b/src/pal/src/arch/i386/context.cpp
index ffccf0f..f9ff458 100644 (file)
--- a/src/pal/src/arch/i386/context.cpp
+++ b/src/pal/src/arch/i386/context.cpp
@@ -1322,7 +1322,8 @@ Function:
 --*/
 // Bullseye has parsing problems if "asm" comes after VOID
 
-#ifndef __clang__
+#ifndef __llvm__
+asm
 VOID 
 DBG_CheckStackAlignment()
 {
@@ -1346,6 +1347,6 @@ DBG_CheckStackAlignment()
     // Epilog
     leave
 }
-#endif // !__clang__
+#endif // !__llvm__
 #endif // DEBUG && APPLE