Skip to content
Snippets Groups Projects
Commit 76b343f5 authored by Ben Gamari's avatar Ben Gamari
Browse files

Revert "rts: Use .cfi_{start|end}proc directives"

This reverts commit 86210b23.
parent 8df24474
No related branches found
No related tags found
No related merge requests found
...@@ -363,15 +363,6 @@ saved on the stack by the call instruction. Then we perform regular Haskell ...@@ -363,15 +363,6 @@ saved on the stack by the call instruction. Then we perform regular Haskell
stack unwinding. stack unwinding.
*/ */
/*
* gcc automatically inserts .cfi_startproc/.cfi_endproc directives around
* inline assembler but clang does not. This caused the build to fail with
* Clang (see #15207).
*/
#if defined(__clang__)
#define NEED_EXPLICIT_CFI_START_END
#endif
static void GNUC3_ATTRIBUTE(used) static void GNUC3_ATTRIBUTE(used)
StgRunIsImplementedInAssembler(void) StgRunIsImplementedInAssembler(void)
...@@ -385,10 +376,6 @@ StgRunIsImplementedInAssembler(void) ...@@ -385,10 +376,6 @@ StgRunIsImplementedInAssembler(void)
STG_HIDDEN STG_RUN "\n" STG_HIDDEN STG_RUN "\n"
#endif #endif
STG_RUN ":\n\t" STG_RUN ":\n\t"
#if defined(NEED_EXPLICIT_CFI_START_END)
".cfi_startproc simple\n\t"
#endif
"subq %1, %%rsp\n\t" "subq %1, %%rsp\n\t"
"movq %%rsp, %%rax\n\t" "movq %%rsp, %%rax\n\t"
"subq %0, %%rsp\n\t" "subq %0, %%rsp\n\t"
...@@ -475,10 +462,6 @@ StgRunIsImplementedInAssembler(void) ...@@ -475,10 +462,6 @@ StgRunIsImplementedInAssembler(void)
#if !defined(mingw32_HOST_OS) #if !defined(mingw32_HOST_OS)
STG_HIDDEN xstr(STG_RUN_JMP) "\n" STG_HIDDEN xstr(STG_RUN_JMP) "\n"
#endif #endif
#if defined(NEED_EXPLICIT_CFI_START_END)
".cfi_endproc\n\t"
#endif
#if HAVE_SUBSECTIONS_VIA_SYMBOLS #if HAVE_SUBSECTIONS_VIA_SYMBOLS
// If we have deadstripping enabled and a label is detected as unused // If we have deadstripping enabled and a label is detected as unused
// the code gets nop'd out. // the code gets nop'd out.
...@@ -517,7 +500,7 @@ StgRunIsImplementedInAssembler(void) ...@@ -517,7 +500,7 @@ StgRunIsImplementedInAssembler(void)
"movq 136(%%rax),%%xmm15\n\t" "movq 136(%%rax),%%xmm15\n\t"
#endif #endif
"addq %1, %%rsp\n\t" "addq %1, %%rsp\n\t"
"retq\n\t" "retq"
: :
: "i"(RESERVED_C_STACK_BYTES), : "i"(RESERVED_C_STACK_BYTES),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment