paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 18:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix wince compilation using FPC_HAS_SYSRELOCATETHREADVAR_ASM macro.

Browse Source 
Replaces merge request !705
This commit is contained in:
Pierre Muller 2024-07-09 17:30:45 +02:00
parent b64701da1b
commit b1f0c504cc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/win/systhrd.inc
View File

@ -164,8 +164,11 @@ function WinTryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
https://devblogs.microsoft.com/oldnewthing/20220919-00/?p=107195
TL;DR: even in Windows sources, TlsGetValue is written in relatively high-level manner and not overly optimized. }
{$undef FPC_HAS_SYSRELOCATETHREADVAR_ASM}
{$ifndef wince} { Don’t know a thing, maybe WinCE TEB is compatible... :D https://stackoverflow.com/questions/1099311/windows-ce-internals-teb-thread-environment-block }
{$if defined(cpui386)}
{$define FPC_HAS_SYSRELOCATETHREADVAR_ASM}
function TrulyRelocateThreadvar(offset : dword) : pointer; forward;
function SysRelocateThreadvar(offset : dword) : pointer; assembler; nostackframe;
@ -198,6 +201,7 @@ function WinTryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
add %edx, %eax { result := TlsGetValue(TLSKey^) + offset. }
end;
{$elseif defined(cpux86_64)}
{$define FPC_HAS_SYSRELOCATETHREADVAR_ASM}
function TrulyRelocateThreadvar(offset : dword) : pointer; forward;
function SysRelocateThreadvar(offset : dword) : pointer; assembler; nostackframe;
@ -233,7 +237,7 @@ function WinTryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
{$endif not wince}
function {$if declared(SysRelocateThreadvar)} TrulyRelocateThreadvar {$else} SysRelocateThreadvar {$endif} (offset : dword) : pointer;
function {$ifdef FPC_HAS_SYSRELOCATETHREADVAR_ASM} TrulyRelocateThreadvar {$else} SysRelocateThreadvar {$endif} (offset : dword) : pointer;
var
dataindex : pointer;
errorsave : dword;