1*4882a593SmuzhiyunFrom be030314805137cd63b46ea6eaa702b608669910 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 2 Jun 2019 17:45:47 +0200 4*4882a593SmuzhiyunSubject: [PATCH] wrap_memcpy.cc: add GPR_DISABLE_WRAPPED_MEMCPY 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAdd GPR_DISABLE_WRAPPED_MEMCPY to allow the user to disable wrapped 7*4882a593Smuzhiyunmemcpy. This will fix build on x86_64 on musl/uclibc without changing 8*4882a593Smuzhiyunthe cpu behavior. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunFixes: 11*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/20d6f2489a4e291a53bd514da66105eb607e1014 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14*4882a593Smuzhiyun[Upstream status: https://github.com/grpc/grpc/pull/19207] 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun src/core/lib/gpr/wrap_memcpy.cc | 2 +- 17*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc 20*4882a593Smuzhiyunindex 9b8608e056..38b76acf95 100644 21*4882a593Smuzhiyun--- a/src/core/lib/gpr/wrap_memcpy.cc 22*4882a593Smuzhiyun+++ b/src/core/lib/gpr/wrap_memcpy.cc 23*4882a593Smuzhiyun@@ -29,7 +29,7 @@ 24*4882a593Smuzhiyun extern "C" { 25*4882a593Smuzhiyun #ifdef __linux__ 26*4882a593Smuzhiyun #if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \ 27*4882a593Smuzhiyun- !defined(__ANDROID__) 28*4882a593Smuzhiyun+ !defined(__ANDROID__) && !defined(GPR_DISABLE_WRAPPED_MEMCPY) 29*4882a593Smuzhiyun __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); 30*4882a593Smuzhiyun void* __wrap_memcpy(void* destination, const void* source, size_t num) { 31*4882a593Smuzhiyun return memcpy(destination, source, num); 32*4882a593Smuzhiyun-- 33*4882a593Smuzhiyun2.20.1 34*4882a593Smuzhiyun 35