diff options
| author | Geoff Norton <grompf@gmail.com> | 2015-02-06 17:09:25 -0800 |
|---|---|---|
| committer | Geoff Norton <grompf@gmail.com> | 2015-02-06 17:09:25 -0800 |
| commit | d2888133afb5eb7790a2030fbef3bd9137d3d97e (patch) | |
| tree | 6d20695ac09b3c9294e394836f7334fcba15fe74 /src | |
| parent | 9b0b142d5328381deab45fceb9ae42e536bd5324 (diff) | |
| download | coreclr-d2888133afb5eb7790a2030fbef3bd9137d3d97e.tar.gz coreclr-d2888133afb5eb7790a2030fbef3bd9137d3d97e.tar.bz2 coreclr-d2888133afb5eb7790a2030fbef3bd9137d3d97e.zip | |
Refactor the DBG_CheckStackAlignment support to be more consistent with the rest of the PAL
Diffstat (limited to 'src')
| -rw-r--r-- | src/pal/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/pal/src/arch/i386/context.S (renamed from src/pal/src/arch/i386/context.clang.s) | 0 | ||||
| -rw-r--r-- | src/pal/src/arch/i386/context.cpp | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index 9401e00592..52bbd614cc 100644 --- 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 index b13de6d7da..b13de6d7da 100644 --- a/src/pal/src/arch/i386/context.clang.s +++ b/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 ffccf0f67b..f9ff458b5d 100644 --- 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 |