Author: Raul Tambre Date: 2020-12-16T10:22:04+02:00 New Revision: b2851aea80e5a8f0cfd6c3c5a56a6b00fb28c6b6
URL: https://github.com/llvm/llvm-project/commit/b2851aea80e5a8f0cfd6c3c5a56a6b00fb28c6b6 DIFF: https://github.com/llvm/llvm-project/commit/b2851aea80e5a8f0cfd6c3c5a56a6b00fb28c6b6.diff LOG: Revert "[Compiler-rt][AArch64] Workaround for .cfi_startproc assembler parser bug." 039cb03dd0dcff4daa17a062f7414ac22bf5f2eb (D93378) fixed the assembly separator, so the workaround is no longer necessary. This reverts commit 3000c19df64f89ff319590f3a6e4d6b93d20983d. Differential Revision: https://reviews.llvm.org/D93379 Added: Modified: compiler-rt/lib/builtins/aarch64/lse.S compiler-rt/lib/builtins/assembly.h Removed: ################################################################################ diff --git a/compiler-rt/lib/builtins/aarch64/lse.S b/compiler-rt/lib/builtins/aarch64/lse.S index 87d8b3ac9be4..7a9433fd89cf 100644 --- a/compiler-rt/lib/builtins/aarch64/lse.S +++ b/compiler-rt/lib/builtins/aarch64/lse.S @@ -113,8 +113,7 @@ HIDDEN(__aarch64_have_lse_atomics) .endm #ifdef L_cas -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(cas)) -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(cas)) +DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) JUMP_IF_NOT_LSE 8f #if SIZE < 16 #ifdef HAS_ASM_LSE @@ -167,8 +166,7 @@ END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) #else #define SWP .inst 0x38208020 + B + N #endif -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(swp)) -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(swp)) +DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) JUMP_IF_NOT_LSE 8f SWP // s(0), s(0), [x1] ret @@ -211,8 +209,7 @@ END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #define LDOP .inst 0x38200020 + OPN + B + N #endif -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(LDNM)) -DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(LDNM)) +DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) JUMP_IF_NOT_LSE 8f LDOP // s(0), s(0), [x1] ret diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h index 0f86c74a9ca2..f6ce6a9fccff 100644 --- a/compiler-rt/lib/builtins/assembly.h +++ b/compiler-rt/lib/builtins/assembly.h @@ -243,16 +243,12 @@ DECLARE_FUNC_ENCODING \ name: -// TODO(ilinpv) START & END parts will be merged when assembly parser bug -// (kristina) in MasmParser::parseDirectiveCFIStartProc() is fixed. -#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(name) \ +#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(name) \ DEFINE_CODE_STATE \ FUNC_ALIGN \ .globl name SEPARATOR \ SYMBOL_IS_FUNC(name) SEPARATOR \ - DECLARE_SYMBOL_VISIBILITY(name) - -#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(name) \ + DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \ CFI_START SEPARATOR \ DECLARE_FUNC_ENCODING \ name: SEPARATOR BTI_C _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
