8000 Don't try to use language level TLS on Cygwin. · log4cplus/log4cplus@04fcd97 · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 04fcd97

Browse files
committed
Don't try to use language level TLS on Cygwin.
Cygwin passes the compilation and link test in configure script but fails during linking of the real code, so we want to avoid it. See GCC PR64697.
1 parent 57930a1 commit 04fcd97

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10585,7 +10585,8 @@ fi
1058510585

1058610586
fi
1058710587

10588-
if test "$target_os" != "darwin" -o "$target_cpu" != "arm"; then :
10588+
if test \( "$target_os" != "darwin" -o "$target_cpu" != "arm" \) \
10589+
-a "$target_os" != "cygwin"; then :
1058910590

1059010591

1059110592

configure.ac

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,11 @@ dnl Multi threaded library.
537537
[AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])])
538538
539539
dnl Check if TLS is supported, but only if it isn't iOS target, because it
540-
dnl is forbidden by Apple Store to use __tlv_* functions.
541-
AS_IF([test "$target_os" != "darwin" -o "$target_cpu" != "arm"],
540+
dnl is forbidden by Apple Store to use __tlv_* functions. Also, Cygwin
541+
dnl passes the compilation and link test here but fails during linking of
542+
dnl the real code, so we want to avoid it too. See GCC PR64697.
543+
AS_IF([test \( "$target_os" != "darwin" -o "$target_cpu" != "arm" \) \
544+
-a "$target_os" != "cygwin"],
542545
[AX_TLS_SUPPORT])
543546
544547
AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT])

0 commit comments

Comments
 (0)
0