diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-08-12 14:26:13 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:05 +0200 |
commit | c0ce7599526c4dce6d889fc4a5aa007f445e6d76 (patch) | |
tree | 6dd1e4b095cf937f2a50466daf4a2a1a6796fb9a /meta-oe/recipes-support/syslog-ng/files | |
parent | efea141c6e6e44ca48f3837e5c3383ccfe9ba247 (diff) | |
download | meta-openembedded-c0ce7599526c4dce6d889fc4a5aa007f445e6d76.tar.gz |
syslog-ng: fix do_compi1e of qemuarm while DEBUG_BUILD
The thread local storage caused arm-gcc broken while compiling
syslog-ng with option '-g -O'.
...
dnscache.s: Assembler messages:
dnscache.s:100: Error: invalid operands (.text and *UND* sections) for `-'
...
Add option --enable-thread-tls in configure to explicitly disable
thread local storage for arm while DEBUG_BUILD enabled.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch new file mode 100644 index 0000000000..cc8d11044a --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch @@ -0,0 +1,50 @@ +configure.ac: add option --enable-thread-tls to manage thread ssl support + +Add option --enable-thread-tls to manage the including of thread +local storage, so we could explicitly disable it. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 474e094..cedca54 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,6 +120,9 @@ AC_ARG_ENABLE(memtrace, + AC_ARG_ENABLE(ssl, + [ --enable-ssl Enable SSL support.],,enable_ssl="auto") + ++AC_ARG_ENABLE(thread-tls, ++ [ --enable-thread-tls Enable Thread Transport Layer Security support.],,enable_thread_tls="no") ++ + AC_ARG_ENABLE(dynamic-linking, + [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") + +@@ -381,12 +384,14 @@ dnl *************************************************************************** + dnl Is the __thread keyword available? + dnl *************************************************************************** + +-AC_LINK_IFELSE([AC_LANG_PROGRAM( +-[[#include <pthread.h> +-__thread int a; +-]], +-[a=0;])], +-[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Transport Layer Security is supported by the system")]) ++if test "x$enable_thread_tls" != "xno"; then ++ AC_LINK_IFELSE([AC_LANG_PROGRAM( ++ [[#include <pthread.h> ++ __thread int a; ++ ]], ++ [a=0;])], ++ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Transport Layer Security is supported by the system")]) ++fi + + dnl *************************************************************************** + dnl How to do static linking? +-- +1.9.1 + |