diff options
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/cmake/builtin-config-ix.cmake | 24 | ||||
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 18 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/asan_rtl_x86_64.S | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/assembly.h | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/orc/elfnix_tls.x86-64.S | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/orc/sysv_reenter.x86-64.S | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S | 2 |
10 files changed, 43 insertions, 14 deletions
diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index b86bb1b..eaff813 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -117,14 +117,22 @@ include(CompilerRTDarwinUtils) if(APPLE) find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx) - find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) - find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) - find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) - find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) - find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) - find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) - find_darwin_sdk_dir(DARWIN_xrossim_SYSROOT xrsimulator) - find_darwin_sdk_dir(DARWIN_xros_SYSROOT xros) + if(COMPILER_RT_ENABLE_IOS) + find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) + find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) + endif() + if(COMPILER_RT_ENABLE_WATCHOS) + find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) + find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) + endif() + if(COMPILER_RT_ENABLE_TVOS) + find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) + find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) + endif() + if(COMPILER_RT_ENABLE_XROS) + find_darwin_sdk_dir(DARWIN_xrossim_SYSROOT xrsimulator) + find_darwin_sdk_dir(DARWIN_xros_SYSROOT xros) + endif() # Get supported architecture from SDKSettings. function(sdk_has_arch_support sdk_path os arch has_support) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 67db438..8dfbdec 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -408,12 +408,18 @@ if(APPLE) include(CompilerRTDarwinUtils) find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx) - find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) - find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) - find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) - find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) - find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) - find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) + if(COMPILER_RT_ENABLE_IOS) + find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator) + find_darwin_sdk_dir(DARWIN_ios_SYSROOT iphoneos) + endif() + if(COMPILER_RT_ENABLE_WATCHOS) + find_darwin_sdk_dir(DARWIN_watchossim_SYSROOT watchsimulator) + find_darwin_sdk_dir(DARWIN_watchos_SYSROOT watchos) + endif() + if(COMPILER_RT_ENABLE_TVOS) + find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator) + find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos) + endif() if(NOT DARWIN_osx_SYSROOT) message(WARNING "Could not determine OS X sysroot, trying /usr/include") diff --git a/compiler-rt/lib/asan/asan_rtl_x86_64.S b/compiler-rt/lib/asan/asan_rtl_x86_64.S index 9c52898..5ee830d 100644 --- a/compiler-rt/lib/asan/asan_rtl_x86_64.S +++ b/compiler-rt/lib/asan/asan_rtl_x86_64.S @@ -5,6 +5,7 @@ #include "sanitizer_common/sanitizer_platform.h" .file "asan_rtl_x86_64.S" +.att_syntax #define NAME(n, reg, op, s, i) n##_##op##_##i##_##s##_##reg diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h index d1e5328..ac119af 100644 --- a/compiler-rt/lib/builtins/assembly.h +++ b/compiler-rt/lib/builtins/assembly.h @@ -337,4 +337,9 @@ #endif #endif +#if defined(__ASSEMBLER__) && (defined(__i386__) || defined(__amd64__)) && \ + !defined(__arm64ec__) +.att_syntax +#endif + #endif // COMPILERRT_ASSEMBLY_H diff --git a/compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S b/compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S index 9804e8d..a5379d3 100644 --- a/compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S +++ b/compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S @@ -30,6 +30,7 @@ .section .text .file "hwasan_setjmp_x86_64.S" +.att_syntax .global ASM_WRAPPER_NAME(setjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(setjmp)) diff --git a/compiler-rt/lib/orc/elfnix_tls.x86-64.S b/compiler-rt/lib/orc/elfnix_tls.x86-64.S index b3e0bef..da20212 100644 --- a/compiler-rt/lib/orc/elfnix_tls.x86-64.S +++ b/compiler-rt/lib/orc/elfnix_tls.x86-64.S @@ -13,6 +13,7 @@ // The content of this file is x86_64-only #if defined(__x86_64__) +.att_syntax #define REGISTER_SAVE_SPACE_SIZE 512 diff --git a/compiler-rt/lib/orc/sysv_reenter.x86-64.S b/compiler-rt/lib/orc/sysv_reenter.x86-64.S index 0a36280..99615c0 100644 --- a/compiler-rt/lib/orc/sysv_reenter.x86-64.S +++ b/compiler-rt/lib/orc/sysv_reenter.x86-64.S @@ -12,6 +12,7 @@ // The content of this file is x86_64-only #if defined(__x86_64__) +.att_syntax // Save all GRPS except %rsp. // This value is also subtracted from %rsp below, despite the fact that %rbp diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S index c633014..5ef090c 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_i386.inc.S @@ -2,6 +2,8 @@ #include "sanitizer_common/sanitizer_asm.h" +.att_syntax + .comm _ZN14__interception10real_vforkE,4,4 .globl ASM_WRAPPER_NAME(vfork) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(vfork)) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S index 5500f81..9c85407 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_x86_64.inc.S @@ -2,6 +2,8 @@ #include "sanitizer_common/sanitizer_asm.h" +.att_syntax + .comm _ZN14__interception10real_vforkE,8,8 .globl ASM_WRAPPER_NAME(vfork) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(vfork)) diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S index f848be9..8b9b706 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S @@ -3,6 +3,8 @@ #include "sanitizer_common/sanitizer_asm.h" +.att_syntax + #if !defined(__APPLE__) .section .text #else |