summaryrefslogtreecommitdiffstats
path: root/debian/patches/glibc-2.30.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/glibc-2.30.patch')
-rw-r--r--debian/patches/glibc-2.30.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/glibc-2.30.patch b/debian/patches/glibc-2.30.patch
new file mode 100644
index 0000000..22a4042
--- /dev/null
+++ b/debian/patches/glibc-2.30.patch
@@ -0,0 +1,52 @@
+From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Tue, 29 Oct 2019 17:30:09 -0400
+Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid.
+
+glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/).
+gettid will clash with the glibc-provided symbol. Remove the
+macro and instead move to a dedicated namespace.
+
+We go this route to avoid introducing unnecessary complexity to
+build.
+
+Fixes #147
+---
+ regressions/common.h | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+--- a/regressions/common.h
++++ b/regressions/common.h
+@@ -267,13 +267,11 @@
+ #define AFFINITY_INITIALIZER {0, 0}
+
+ #ifdef __linux__
+-#ifndef gettid
+ static pid_t
+-gettid(void)
++common_gettid(void)
+ {
+ return syscall(__NR_gettid);
+ }
+-#endif /* gettid */
+
+ CK_CC_UNUSED static int
+ aff_iterate(struct affinity *acb)
+@@ -285,7 +283,7 @@
+ CPU_ZERO(&s);
+ CPU_SET(c % CORES, &s);
+
+- return sched_setaffinity(gettid(), sizeof(s), &s);
++ return sched_setaffinity(common_gettid(), sizeof(s), &s);
+ }
+
+ CK_CC_UNUSED static int
+@@ -297,7 +295,7 @@
+ CPU_ZERO(&s);
+ CPU_SET((*core) % CORES, &s);
+
+- return sched_setaffinity(gettid(), sizeof(s), &s);
++ return sched_setaffinity(common_gettid(), sizeof(s), &s);
+ }
+ #elif defined(__MACH__)
+ CK_CC_UNUSED static int