From: Bruce Cran <bcran@fusionio.com>
Date: Thu, 7 Nov 2013 14:04:00 +0000 (+0000)
Subject: Windows: add CONFIG_TLS_THREAD=y and swap pthreadGC2 to libwinpthread-1.
X-Git-Tag: fio-2.1.5~47^2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7d6be13abb5155045cd8b6bcd8a50fea5391a741;hp=f01b34ae759afccf39c1bf47972e45d91448e7bb

Windows: add CONFIG_TLS_THREAD=y and swap pthreadGC2 to libwinpthread-1.

Since GCC 4.4, MinGW has supported TLS via the __thread keyword, so
generate config-host.mak with CONFIG_TLS_THREAD=y.

MinGW now uses a new threading library libwinpthread-1.dll: install it
instead of pthreadGC2.dll.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/configure b/configure
index ef7be018..0f1acd0b 100755
--- a/configure
+++ b/configure
@@ -243,6 +243,7 @@ CYGWIN*)
   output_sym "CONFIG_CLOCK_GETTIME"
   output_sym "CONFIG_SCHED_IDLE"
   output_sym "CONFIG_TCP_NODELAY"
+  output_sym "CONFIG_TLS_THREAD"
   echo "CC=$CC" >> $config_host_mak
   echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
   exit 0
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index ac145bcc..adc50f65 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -27,7 +27,7 @@
 							<File Source="..\..\fio.exe"/>
 						</Component>
 						<Component>
-							<File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>
+							<File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
 						</Component>
 						<Component>
 							<File Id="README" Name="README.txt" Source="..\..\README"/>