From 6ea34b90da510d9744ad70e45e773f55db676ab8 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Sat, 27 Jun 2020 08:21:26 +0000 Subject: Update to -dev11. --- net/haproxy-devel/files/patch-include-common-hathreads.h | 11 ----------- net/haproxy-devel/files/patch-include-haproxy-atomic.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 net/haproxy-devel/files/patch-include-common-hathreads.h create mode 100644 net/haproxy-devel/files/patch-include-haproxy-atomic.h (limited to 'net/haproxy-devel/files') diff --git a/net/haproxy-devel/files/patch-include-common-hathreads.h b/net/haproxy-devel/files/patch-include-common-hathreads.h deleted file mode 100644 index eddbc9a6e072..000000000000 --- a/net/haproxy-devel/files/patch-include-common-hathreads.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 -+++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000 -@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit - /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to - * have a header file regrouping all functions dealing with threads. */ - --#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) - /* gcc < 4.7 */ - - #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i) diff --git a/net/haproxy-devel/files/patch-include-haproxy-atomic.h b/net/haproxy-devel/files/patch-include-haproxy-atomic.h new file mode 100644 index 000000000000..d8b7c8ea15cb --- /dev/null +++ b/net/haproxy-devel/files/patch-include-haproxy-atomic.h @@ -0,0 +1,11 @@ +--- include/haproxy/atomic.h.orig 2018-02-17 18:17:22.219400000 +0000 ++++ include/haproxy/atomic.h 2018-02-17 18:18:44.598422000 +0000 +@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit + /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to + * have a header file regrouping all functions dealing with threads. */ + +-#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) ++#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) + /* gcc < 4.7 */ + + #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i) -- cgit v1.2.3