diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-27 07:47:22 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-28 16:44:17 +0200 |
commit | ff36422c2bd964599829f6cfba90a7fea42b9f40 (patch) | |
tree | 31257785bee177678330feb4f9fa127b178f71bb /patches | |
parent | 6e3ba083ef9486f2d6002e616d07ee4e8168c85d (diff) | |
download | ptxdist-ff36422c2bd964599829f6cfba90a7fea42b9f40.tar.gz ptxdist-ff36422c2bd964599829f6cfba90a7fea42b9f40.tar.xz |
grpc: add upstream fixes for glibc 2.30 and gcc 9.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/grpc-1.21.0/0100-Fix-gettid-naming-conflict.patch | 32 | ||||
-rw-r--r-- | patches/grpc-1.21.0/0101-Rename-gettid-functions.patch | 79 | ||||
-rw-r--r-- | patches/grpc-1.21.0/series | 4 |
3 files changed, 114 insertions, 1 deletions
diff --git a/patches/grpc-1.21.0/0100-Fix-gettid-naming-conflict.patch b/patches/grpc-1.21.0/0100-Fix-gettid-naming-conflict.patch new file mode 100644 index 000000000..65979bbce --- /dev/null +++ b/patches/grpc-1.21.0/0100-Fix-gettid-naming-conflict.patch @@ -0,0 +1,32 @@ +From: Juanli Shen <juanlishen@google.com> +Date: Fri, 23 Aug 2019 08:46:09 -0700 +Subject: [PATCH] Fix gettid() naming conflict + +--- + src/core/lib/gpr/log_linux.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 561276f0c20a..81026e5689bc 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,9 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++// Not naming it as gettid() to avoid duplicate declarations when complied with ++// GCC 9.1. ++static long local_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = local_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); diff --git a/patches/grpc-1.21.0/0101-Rename-gettid-functions.patch b/patches/grpc-1.21.0/0101-Rename-gettid-functions.patch new file mode 100644 index 000000000..b9ece8175 --- /dev/null +++ b/patches/grpc-1.21.0/0101-Rename-gettid-functions.patch @@ -0,0 +1,79 @@ +From: Benjamin Peterson <benjamin@dropbox.com> +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689bc..8b597b4cf2f1 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,9 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-// Not naming it as gettid() to avoid duplicate declarations when complied with +-// GCC 9.1. +-static long local_gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -72,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = local_gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b9..2f7c6ce37605 100644 +--- a/src/core/lib/gpr/log_posix.cc ++++ b/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index 08116b3ab534..76f598443120 100644 +--- a/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/patches/grpc-1.21.0/series b/patches/grpc-1.21.0/series index f855d43a1..72f6287db 100644 --- a/patches/grpc-1.21.0/series +++ b/patches/grpc-1.21.0/series @@ -2,4 +2,6 @@ #tag:base --start-number 1 0001-Add-pkg-config-files.patch #tag:upstream --start-number 100 -# bb88160543076859dd8fb26f54d571b1 - git-ptx-patches magic +0100-Fix-gettid-naming-conflict.patch +0101-Rename-gettid-functions.patch +# c5d68a15d62fcc8495ce48a49dd9d92d - git-ptx-patches magic |