Jelajahi Sumber

* Windows: Prevent removal of the TLS directory by the linker when RTL is compiled with -O4 or when inlining is enabled.

git-svn-id: trunk@49400 -
yury 4 tahun lalu
induk
melakukan
73448deda6
2 mengubah file dengan 4 tambahan dan 2 penghapusan
  1. 2 1
      rtl/win32/sysinit.inc
  2. 2 1
      rtl/win64/sysinit.pp

+ 2 - 1
rtl/win32/sysinit.inc

@@ -31,8 +31,9 @@
    var
       tlsdir: record end; external name '__tls_used';
 
-    procedure LinkIn(p1,p2,p3: Pointer); inline;
+    function LinkIn(p1,p2,p3: Pointer): pointer;
       begin
+        LinkIn:=p1;
       end;
 {$endif}
 

+ 2 - 1
rtl/win64/sysinit.pp

@@ -36,8 +36,9 @@ unit sysinit;
    var
       tlsdir: record end; external name '_tls_used';
 
-    procedure LinkIn(p1,p2,p3: Pointer); inline;
+    function LinkIn(p1,p2,p3: Pointer): pointer;
       begin
+        LinkIn:=p1;
       end;
 {$endif}