From: Kirill Stoimenov <kstoimenov@google.com>
Date: Thu, 10 Mar 2022 21:29:55 +0000 (+0000)
Subject: [ASan] Added back @PLT to __asan_report_* calls to avoid compile errors.
X-Git-Tag: upstream/15.0.7~13984
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=120e0434bcda3c1ed00e77ded0de9690dad2c347;p=platform%2Fupstream%2Fllvm.git

[ASan] Added back @PLT to __asan_report_* calls to avoid compile errors.

Reviewed By: vitalybuka

Differential Revision: https://reviews.llvm.org/D121409
---

diff --git a/compiler-rt/lib/asan/asan_rtl_x86_64.S b/compiler-rt/lib/asan/asan_rtl_x86_64.S
index 92376f5..d27db74 100644
--- a/compiler-rt/lib/asan/asan_rtl_x86_64.S
+++ b/compiler-rt/lib/asan/asan_rtl_x86_64.S
@@ -42,7 +42,7 @@ CLABEL(reg, op, 1, i): ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 1, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##1 ;\
+        jmp    __asan_report_##op##1@PLT ;\
 
 #define ASAN_MEMORY_ACCESS_EXTRA_CHECK_2(reg, op, i) \
 CLABEL(reg, op, 2, i): ;\
@@ -54,7 +54,7 @@ CLABEL(reg, op, 2, i): ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 2, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##2 ;\
+        jmp    __asan_report_##op##2@PLT ;\
 
 #define ASAN_MEMORY_ACCESS_EXTRA_CHECK_4(reg, op, i) \
 CLABEL(reg, op, 4, i): ;\
@@ -66,7 +66,7 @@ CLABEL(reg, op, 4, i): ;\
         pop    %rcx ;\
         jl     RLABEL(reg, op, 4, i);\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##4 ;\
+        jmp    __asan_report_##op##4@PLT ;\
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_1(reg, op) \
 BEGINF(reg, op, 1, add) ;\
@@ -97,7 +97,7 @@ ENDF
 #define ASAN_MEMORY_ACCESS_FAIL(reg, op, s, i) \
 FLABEL(reg, op, s, i): ;\
         mov    %##reg,%rdi ;\
-        jmp    __asan_report_##op##s##;\
+        jmp    __asan_report_##op##s@PLT;\
 
 #define ASAN_MEMORY_ACCESS_CALLBACK_ADD_8(reg, op) \
 BEGINF(reg, op, 8, add) ;\