From 3c79f3055f4b9d3a67c7ee814f8ebc9cba1bda12 Mon Sep 17 00:00:00 2001 From: Yi-Hong Lyu Date: Fri, 10 Dec 2021 17:30:26 +0800 Subject: [PATCH] Weaken x86.get_pc_thunk for NDK <= r22 (#9994) Otherwise there is multiple definition of '__x86.get_pc_thunk.bx' --- onnxruntime/core/mlas/lib/x86/x86.get_pc_thunk.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/onnxruntime/core/mlas/lib/x86/x86.get_pc_thunk.S b/onnxruntime/core/mlas/lib/x86/x86.get_pc_thunk.S index b3c4f6ac8b..fd81ddb7e3 100644 --- a/onnxruntime/core/mlas/lib/x86/x86.get_pc_thunk.S +++ b/onnxruntime/core/mlas/lib/x86/x86.get_pc_thunk.S @@ -14,9 +14,6 @@ Abstract: --*/ - -#include "asmmacro.h" - .intel_syntax noprefix /*++ @@ -28,7 +25,9 @@ Routine Description: --*/ - FUNCTION_ENTRY __x86.get_pc_thunk.bx - + .p2align 4 + .weak __x86.get_pc_thunk.bx + .type __x86.get_pc_thunk.bx,@function +__x86.get_pc_thunk.bx: mov ebx, [esp] ret