diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-10-02 21:28:58 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-10-03 09:47:13 +0200 |
| commit | f22fca4bf27f884950dd7804020e5d5193b570b9 (patch) | |
| tree | 68d98421e80c73602dc3b653cef6e1bd984a99a5 /package/haproxy | |
| parent | b7a9f919c02358964b88d43daa456230b11f5588 (diff) | |
| download | buildroot-f22fca4bf27f884950dd7804020e5d5193b570b9.tar.gz buildroot-f22fca4bf27f884950dd7804020e5d5193b570b9.zip | |
haproxy: tweak thread activation
If threads are enabled, as described in include/common/hathreads.h,
haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy
uses __atomic_ intrinsics.
As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4
and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the
dependencies are fulfilled in haproxy.mk
Fixes:
- http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/haproxy')
| -rw-r--r-- | package/haproxy/Config.in | 1 | ||||
| -rw-r--r-- | package/haproxy/haproxy.mk | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in index cbcbc0c388..fbe5941b55 100644 --- a/package/haproxy/Config.in +++ b/package/haproxy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_HAPROXY bool "haproxy" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics help HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 363fc4447f..061a8cbbaf 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -20,7 +20,13 @@ HAPROXY_LIBS += -latomic endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +# threads uses atomics on gcc >= 4.7 and sync otherwise (see +# include/common/hathreads.h) +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y) HAPROXY_MAKE_OPTS += USE_THREAD=1 +else ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y) +HAPROXY_MAKE_OPTS += USE_THREAD=1 +endif endif ifeq ($(BR2_PACKAGE_LUA_5_3),y) |
