From 8e2da253f91612c8666d2f654646d0f19a7501eb Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 1 Jul 2011 13:15:00 +0000 Subject: [PATCH] * Index pointer field must be set to correct value in EXECUTABLE as it is used at program launch git-svn-id: trunk@17897 - --- rtl/win/syswin.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rtl/win/syswin.inc b/rtl/win/syswin.inc index d53a1d58d3..a08ba6f502 100644 --- a/rtl/win/syswin.inc +++ b/rtl/win/syswin.inc @@ -180,11 +180,18 @@ const _tls_used : TTlsDirectory = ( data_start : @tls_data_start; data_end : @tls_data_end; - index_pointer : nil; + index_pointer : @tls_index; callbacks_pointer : @tls_callbacks; zero_fill_size : 0; flags : 0; - ); public name '__tls_used'; + ); public name + { This should be the same name as in mingw/tlsup.c code } +{$ifdef win32} + '__tls_used'; +{$else } + '_tls_used'; +{$endif not win32} + {$endif FPC_USE_TLS_DIRECTORY}