From 5f184946cb9ecc04192d0c2ba18577fc5e50a0b0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 23 Jul 2021 13:54:40 +0200 Subject: Removing glibc-2.30.patch, included upstream. Signed-off-by: Daniel Baumann --- debian/patches/glibc-2.30.patch | 52 ----------------------------------------- debian/patches/series | 1 - 2 files changed, 53 deletions(-) delete mode 100644 debian/patches/glibc-2.30.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/glibc-2.30.patch b/debian/patches/glibc-2.30.patch deleted file mode 100644 index 22a4042..0000000 --- a/debian/patches/glibc-2.30.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001 -From: Samy Al Bahra -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 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index c256dc7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -glibc-2.30.patch -- cgit v1.2.3