paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-24 05:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ support tls threadvars with the internal assembler

Browse Source 
git-svn-id: trunk@43070 -
This commit is contained in:
florian 2019-09-25 21:19:03 +00:00
parent f6667a5143
commit 56d91b4ca7
5 changed files with 34 additions and 13 deletions

7
compiler/i386/cpuelf.pas
View File

@ -112,6 +112,13 @@ implementation
result:=R_386_PLT32;
RELOC_GOTOFF:
result:=R_386_GOTOFF;
RELOC_NTPOFF:
if objrel.size=4 then
result:=R_386_TLS_LE
else
InternalError(2019092101);
RELOC_TLSGD:
result:=R_386_TLS_GD;
else
result:=0;
InternalError(2012082301);

5
compiler/ogbase.pas
View File

@ -68,6 +68,8 @@ interface
RELOC_GOTPC,
RELOC_GOT32,
RELOC_PLT32,
RELOC_TLSGD,
RELOC_NTPOFF,
{$endif i386}
{$ifdef i8086}
RELOC_ABSOLUTE32,
@ -1410,6 +1412,9 @@ implementation
{ The weak bit could have been removed from asmsym. }
if (asmsym.bind=AB_EXTERNAL) and (result.bind=AB_WEAK_EXTERNAL) then
result.bind:=AB_EXTERNAL;
{ the TLS type needs to be inherited }
if asmsym.typ=AT_TLS then
result.typ:=AT_TLS;
end
else
result:=nil;

6
compiler/ogelf.pas
View File

@ -666,7 +666,7 @@ implementation
if assigned(objreloc) then
begin
objreloc.size:=len;
if reltype in [RELOC_RELATIVE{$ifdef x86},RELOC_PLT32{$endif}{$ifdef x86_64},RELOC_GOTPCREL,RELOC_TLSGD{$endif}] then
if reltype in [RELOC_RELATIVE{$ifdef x86},RELOC_PLT32{$endif}{$ifdef x86_64},RELOC_TLSGD,RELOC_GOTPCREL{$endif}] then
dec(data,len);
if ElfTarget.relocs_use_addend then
begin
@ -785,8 +785,8 @@ implementation
else
InternalError(2012111801);
end;
{ External symbols must be NOTYPE in relocatable files }
if (objsym.bind<>AB_EXTERNAL) or (kind<>esk_obj) then
{ External symbols must be NOTYPE in relocatable files except if they are TLS symbols }
if (objsym.bind<>AB_EXTERNAL) or (kind<>esk_obj) or (objsym.typ=AT_TLS) then
begin
case objsym.typ of
AT_FUNCTION :

22
compiler/x86/aasmcpu.pas
View File

@ -1510,11 +1510,11 @@ implementation
end;
top_ref :
begin
if (ref^.refaddr in [addr_no{$ifdef x86_64},addr_tpoff{$endif x86_64}])
if (ref^.refaddr in [addr_no{$ifdef x86_64},addr_tpoff{$endif x86_64}{$ifdef i386},addr_ntpoff{$endif i386}])
{$ifdef i386}
or (
(ref^.refaddr in [addr_pic]) and
(ref^.base<>NR_NO)
(ref^.refaddr in [addr_pic,addr_tlsgd]) and
((ref^.base<>NR_NO) or (ref^.index<>NR_NO))
)
{$endif i386}
{$ifdef x86_64}
@ -3577,6 +3577,18 @@ implementation
currabsreloc:=RELOC_GOT32;
currabsreloc32:=RELOC_GOT32;
end
else if oper[opidx]^.ref^.refaddr=addr_ntpoff then
begin
currrelreloc:=RELOC_NTPOFF;
currabsreloc:=RELOC_NTPOFF;
currabsreloc32:=RELOC_NTPOFF;
end
else if oper[opidx]^.ref^.refaddr=addr_tlsgd then
begin
currrelreloc:=RELOC_TLSGD;
currabsreloc:=RELOC_TLSGD;
currabsreloc32:=RELOC_TLSGD;
end
else
{$endif i386}
{$ifdef x86_64}
@ -4565,6 +4577,10 @@ implementation
if (oper[opidx]^.ref^.refaddr=addr_pic) and
(tf_pic_uses_got in target_info.flags) then
currabsreloc:=RELOC_GOT32
else if oper[opidx]^.ref^.refaddr=addr_tlsgd then
currabsreloc:=RELOC_TLSGD
else if oper[opidx]^.ref^.refaddr=addr_ntpoff then
currabsreloc:=RELOC_NTPOFF
else
{$endif i386}
{$ifdef i8086}

7
rtl/linux/i386/si_prc.inc
View File

@ -47,13 +47,6 @@ function fpc_geteipasebxlocal : pointer; [external name 'fpc_geteipasebx'];
procedure InitTLS; [external name 'FPC_INITTLS'];
{ so far, I found no case where this is actually called, so it is a dummy so far (FK) }
function ___tls_get_addr(p : pointer) : pointer; public name '___tls_get_addr';
begin
end;
procedure _FPC_proc_start; assembler; nostackframe; public name '_start';
asm
{ First locate the start of the environment variables }