From bbe70b4f5941063594b9c34545df6fd89db1aeba Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Fri, 24 Feb 2017 23:48:58 +0900 Subject: [PATCH] [Linux/ARM,ARM64] Fix undefined FixContextHandler issue (dotnet/coreclr#9755) Commit migrated from https://github.com/dotnet/coreclr/commit/3392356945aabd5a3ebac5317ff4a0e0361dc9ad --- src/coreclr/src/vm/arm/ehhelpers.S | 2 +- src/coreclr/src/vm/arm64/asmhelpers.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/arm/ehhelpers.S b/src/coreclr/src/vm/arm/ehhelpers.S index 88afc43..1c8b5c0 100644 --- a/src/coreclr/src/vm/arm/ehhelpers.S +++ b/src/coreclr/src/vm/arm/ehhelpers.S @@ -79,7 +79,7 @@ OFFSET_OF_FRAME=(4 + SIZEOF__GSCookie) // Helpers for async (NullRef, AccessViolation) exceptions // - NESTED_ENTRY NakedThrowHelper2,_TEXT,FixContextHandler + NESTED_ENTRY NakedThrowHelper2,_TEXT,UnhandledExceptionHandlerUnix push {r0, lr} // On entry: diff --git a/src/coreclr/src/vm/arm64/asmhelpers.S b/src/coreclr/src/vm/arm64/asmhelpers.S index dd28c3e..64ec153 100644 --- a/src/coreclr/src/vm/arm64/asmhelpers.S +++ b/src/coreclr/src/vm/arm64/asmhelpers.S @@ -1016,7 +1016,7 @@ NESTED_END CallEHFilterFunclet, _TEXT // Helpers for async (NullRef, AccessViolation) exceptions // -NESTED_ENTRY NakedThrowHelper2, _TEXT ,FixContextHandler +NESTED_ENTRY NakedThrowHelper2, _TEXT ,UnhandledExceptionHandlerUnix PROLOG_SAVE_REG_PAIR_INDEXED fp,lr, -16 // On entry: -- 2.7.4