diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-04-20 10:24:06 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-20 10:24:06 -0700 |
| commit | 7432d748d7971944f4c57c900042d945f57b7098 (patch) | |
| tree | 5e4b2b8eae1cd54bde13b8bdf25959f676c1d849 /src | |
| parent | 4bcec4a267e65f994738a19772aae07f5e2ffafb (diff) | |
| parent | 98058337767a2d4ca2a75215292060bfbb2edd76 (diff) | |
Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility
Add flag to compile gpr with compatibility for musl
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/port.h | 1 | ||||
| -rw-r--r-- | src/core/lib/support/cpu_linux.c | 8 | ||||
| -rw-r--r-- | src/core/lib/support/wrap_memcpy.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h index 269dc35003..2a553f4114 100644 --- a/src/core/lib/iomgr/port.h +++ b/src/core/lib/iomgr/port.h @@ -88,6 +88,7 @@ #ifndef __GLIBC__ #define GRPC_LINUX_EPOLL 1 #define GRPC_LINUX_EVENTFD 1 +#define GRPC_MSG_IOVLEN_TYPE int #endif #ifndef GRPC_LINUX_EVENTFD #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1 diff --git a/src/core/lib/support/cpu_linux.c b/src/core/lib/support/cpu_linux.c index 1e50f59823..b826dde160 100644 --- a/src/core/lib/support/cpu_linux.c +++ b/src/core/lib/support/cpu_linux.c @@ -67,16 +67,16 @@ unsigned gpr_cpu_num_cores(void) { } unsigned gpr_cpu_current_cpu(void) { -#ifdef __GLIBC__ +#ifdef GPR_MUSL_LIBC_COMPAT + // sched_getcpu() is undefined on musl + return 0; +#else 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 } diff --git a/src/core/lib/support/wrap_memcpy.c b/src/core/lib/support/wrap_memcpy.c index 050cc6db5e..deb8d6b198 100644 --- a/src/core/lib/support/wrap_memcpy.c +++ b/src/core/lib/support/wrap_memcpy.c @@ -31,6 +31,8 @@ * */ +#include <grpc/support/port_platform.h> + #include <string.h> /* Provide a wrapped memcpy for targets that need to be backwards @@ -40,7 +42,7 @@ */ #ifdef __linux__ -#if defined(__x86_64__) && defined(__GNU_LIBRARY__) +#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); void *__wrap_memcpy(void *destination, const void *source, size_t num) { return memcpy(destination, source, num); |