Removing glibc-2.30.patch, included upstream.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
19bed3a321
commit
c4f6aeb7f9
2 changed files with 0 additions and 53 deletions
52
debian/patches/glibc-2.30.patch
vendored
52
debian/patches/glibc-2.30.patch
vendored
|
@ -1,52 +0,0 @@
|
||||||
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
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1 +0,0 @@
|
||||||
glibc-2.30.patch
|
|
Loading…
Add table
Reference in a new issue