From ebd707c1ef9cb0b8c666ca3bf2c1df190dc4b196 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Wed, 1 Mar 2017 04:35:56 -0500 Subject: [PATCH] [Arm64/Unix] Revert fix stack unwinding in CallDescrWorkerInternal (dotnet/coreclr#9866) Commit migrated from https://github.com/dotnet/coreclr/commit/af6738e34d1c5942dd23eed03c629a5dfaaae10c --- src/coreclr/src/pal/inc/unixasmmacrosarm64.inc | 3 +-- src/coreclr/src/pal/src/arch/arm64/callsignalhandlerwrapper.S | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/coreclr/src/pal/inc/unixasmmacrosarm64.inc b/src/coreclr/src/pal/inc/unixasmmacrosarm64.inc index 34509f3..ed73748 100644 --- a/src/coreclr/src/pal/inc/unixasmmacrosarm64.inc +++ b/src/coreclr/src/pal/inc/unixasmmacrosarm64.inc @@ -43,6 +43,7 @@ C_FUNC(\Name\()_End): .macro PROLOG_STACK_ALLOC Size sub sp, sp, \Size + .cfi_adjust_cfa_offset \Size .endm .macro EPILOG_STACK_FREE Size @@ -66,7 +67,6 @@ C_FUNC(\Name\()_End): .cfi_rel_offset \reg2, \ofs + 8 .ifc \reg1, fp mov fp, sp - .cfi_def_cfa_register fp .endif .endm @@ -77,7 +77,6 @@ C_FUNC(\Name\()_End): .cfi_rel_offset \reg2, 8 .ifc \reg1, fp mov fp, sp - .cfi_def_cfa_register fp .endif .endm diff --git a/src/coreclr/src/pal/src/arch/arm64/callsignalhandlerwrapper.S b/src/coreclr/src/pal/src/arch/arm64/callsignalhandlerwrapper.S index 90fb602..48b2596 100644 --- a/src/coreclr/src/pal/src/arch/arm64/callsignalhandlerwrapper.S +++ b/src/coreclr/src/pal/src/arch/arm64/callsignalhandlerwrapper.S @@ -17,7 +17,6 @@ C_FUNC(SignalHandlerWorkerReturnOffset\Alignment): NESTED_ENTRY CallSignalHandlerWrapper\Alignment, _TEXT, NoHandler __StackAllocationSize = (128 + 8 + 8 + \Alignment) // red zone + fp + lr + alignment PROLOG_STACK_ALLOC __StackAllocationSize - .cfi_adjust_cfa_offset __StackAllocationSize PROLOG_SAVE_REG_PAIR fp, lr, 0 bl EXTERNAL_C_FUNC(signal_handler_worker) LOCAL_LABEL(SignalHandlerWorkerReturn\Alignment): -- 2.7.4