From 532394d3e6ff6730030d864399f9d8466a3b91cb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 23 Jul 2021 13:24:09 +0200 Subject: Adding debian version 0.6.0-2. Signed-off-by: Daniel Baumann --- debian/patches/allow-disable-sse.patch | 57 ++++++++++++++++++++++++++++++++++ debian/patches/glibc-2.30.patch | 52 +++++++++++++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 111 insertions(+) create mode 100644 debian/patches/allow-disable-sse.patch create mode 100644 debian/patches/glibc-2.30.patch create mode 100644 debian/patches/series (limited to 'debian/patches') diff --git a/debian/patches/allow-disable-sse.patch b/debian/patches/allow-disable-sse.patch new file mode 100644 index 0000000..181ab04 --- /dev/null +++ b/debian/patches/allow-disable-sse.patch @@ -0,0 +1,57 @@ +--- a/configure ++++ b/configure +@@ -119,6 +119,7 @@ generate() + -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g" \ + -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g" \ + -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g" \ ++ -e "s#@SSE_DISABLE@#$SSE_DISABLE#g" \ + -e "s#@RTM_ENABLE@#$RTM_ENABLE#g" \ + -e "s#@LSE_ENABLE@#$LSE_ENABLE#g" \ + -e "s#@VMA_BITS@#$VMA_BITS_R#g" \ +@@ -160,6 +161,7 @@ generate_stdout() + echo " MEMORY_MODEL = $MM" + echo " RTM = $RTM_ENABLE" + echo " LSE = $LSE_ENABLE" ++ echo " SSE = $SSE_DISABLE" + echo + echo "Headers will be installed in $HEADERS" + echo "Libraries will be installed in $LIBRARY" +@@ -201,6 +203,7 @@ for option; do + echo " --platform=N Force the platform type, instead of relying on autodetection" + echo " --use-cc-builtins Use the compiler atomic bultin functions, instead of the CK implementation" + echo " --disable-double Don't generate any of the functions using the \"double\" type" ++ echo " --disable-sse Do not use any SSE instructions (x86 only)" + echo + echo "The following options affect regression testing." + echo " --cores=N Specify number of cores available on target machine" +@@ -243,6 +246,9 @@ for option; do + --enable-lse) + LSE_ENABLE_SET="CK_MD_LSE_ENABLE" + ;; ++ --disable-sse) ++ SSE_DISABLE="CK_MD_SSE_DISABLE" ++ ;; + --cores=*) + CORES=$value + ;; +@@ -313,6 +319,7 @@ GZIP=${GZIP:-"gzip -c"} + POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} + DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"} + RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"} ++SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"} + LSE_ENABLE=${LSE_ENABLE_SET:-"CK_MD_LSE_DISABLE"} + VMA_BITS=${VMA_BITS:-"unknown"} + +--- a/include/ck_md.h.in ++++ b/include/ck_md.h.in +@@ -47,6 +47,10 @@ + #define @POINTER_PACK_ENABLE@ + #endif /* @POINTER_PACK_ENABLE@ */ + ++#ifndef @SSE_DISABLE@ ++#define @SSE_DISABLE@ ++#endif /* @SSE_DISABLE@ */ ++ + #ifndef @VMA_BITS@ + #define @VMA_BITS@ @VMA_BITS_VALUE@ + #endif /* @VMA_BITS@ */ 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 +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 new file mode 100644 index 0000000..422ecb0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +allow-disable-sse.patch +glibc-2.30.patch -- cgit v1.2.3