diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-11 09:17:02 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-11 09:17:02 -0700 |
| commit | 7fb23e4e5205890e8d5c5bd7767be53ba570446d (patch) | |
| tree | 40e8c32b8ca95f7d217933c5ebac04e059c02c48 /src/core/lib/support | |
| parent | cfab1b8758af3f78f6a5851283e2b8e4bf14c56c (diff) | |
| parent | 498e2b350aec3d358b3ec505fa800194778cd8e4 (diff) | |
Merge github.com:grpc/grpc into c++lame
Diffstat (limited to 'src/core/lib/support')
| -rw-r--r-- | src/core/lib/support/cpu_linux.c | 5 | ||||
| -rw-r--r-- | src/core/lib/support/wrap_memcpy.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/lib/support/cpu_linux.c b/src/core/lib/support/cpu_linux.c index d6f7e7d3da..1e50f59823 100644 --- a/src/core/lib/support/cpu_linux.c +++ b/src/core/lib/support/cpu_linux.c @@ -67,12 +67,17 @@ unsigned gpr_cpu_num_cores(void) { } unsigned gpr_cpu_current_cpu(void) { +#ifdef __GLIBC__ int cpu = sched_getcpu(); if (cpu < 0) { gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); return 0; } return (unsigned)cpu; +#else + // sched_getcpu() is undefined on musl + return 0; +#endif } #endif /* GPR_CPU_LINUX */ diff --git a/src/core/lib/support/wrap_memcpy.c b/src/core/lib/support/wrap_memcpy.c index 15c289f7b8..050cc6db5e 100644 --- a/src/core/lib/support/wrap_memcpy.c +++ b/src/core/lib/support/wrap_memcpy.c @@ -40,7 +40,7 @@ */ #ifdef __linux__ -#ifdef __x86_64__ +#if defined(__x86_64__) && defined(__GNU_LIBRARY__) __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); void *__wrap_memcpy(void *destination, const void *source, size_t num) { return memcpy(destination, source, num); |