浏览代码

Replace __tls_used for win64 by an alias of _tls_used

git-svn-id: trunk@36120 -
pierre 8 年之前
父节点
当前提交
eb378c1b94
共有 1 个文件被更改,包括 5 次插入12 次删除
  1. 5 12
      rtl/win/systlsdir.inc

+ 5 - 12
rtl/win/systlsdir.inc

@@ -143,23 +143,16 @@ const
     zero_fill_size : 0;
     flags : 0;
   ); cvar; public;
-
 {$ifdef win64}
-  { This is a hack to support external linking.
+  { This was a hack to support external linking.
     All released win64 versions of GNU binutils miss proper prefix handling
     when searching for _tls_used and expect two leading underscores.
     The issue has been fixed in binutils snapshots, but not released yet.
 
-    TODO: This should be removed as soon as next version of binutils (>2.21) is
-    released and we upgrade to it. }
-    __tls_used : TTlsDirectory = (
-      data_start : @tls_data_start;
-      data_end : @tls_data_end;
-      index_pointer : @_tls_index;
-      callbacks_pointer : @tls_callbacks;
-      zero_fill_size : 0;
-      flags : 0;
-    ); cvar; public;
+    Using alias allows to support both older and newer binutils.
+    }
+  alias = '__tls_used';
 {$endif win64}
+
 {$endif FPC_USE_TLS_DIRECTORY}