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