paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 12:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* initialize prtobj and reorder in InitSysInitUnitName

Browse Source 
git-svn-id: trunk@41699 -
This commit is contained in:
nickysn 2019-03-14 17:02:20 +00:00
parent 525eff2927
commit 58d9e58742
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
compiler/systems/t_bsd.pas
View File

@ -254,16 +254,54 @@ End;
procedure TLinkerBSD.InitSysInitUnitName;
var
cprtobj,
gprtobj : string[80];
begin
if target_info.system in systems_darwin then
begin
{ for darwin: always link dynamically against libc }
linklibc := true;
reorder:=reorderentries;
prtobj:='';
SysInitUnit:='sysinit';
end
else
begin
linklibc:=ModulesLinkToLibc;
if current_module.islibrary and
(target_info.system in systems_bsd) then
begin
prtobj:='dllprt0';
cprtobj:='dllprt0';
gprtobj:='dllprt0';
end
else
begin
prtobj:='prt0';
cprtobj:='cprt0';
gprtobj:='gprt0';
end;
// this one is a bit complex.
// Only reorder for now if -XL or -XO params are given
// or when -Xf.
reorder:= linklibc and
(
ReorderEntries
or
(cs_link_pthread in current_settings.globalswitches));
if cs_profile in current_settings.moduleswitches then
begin
prtobj:=gprtobj;
AddSharedLibrary('c');
LibrarySuffix:='p';
linklibc:=true;
end
else
begin
if linklibc then
prtobj:=cprtobj;
end;
end;
end;
@ -422,8 +460,6 @@ Var
linkres : TLinkRes;
FilesList : TLinkRes;
i : longint;
cprtobj,
gprtobj : string[80];
HPath : TCmdStrListItem;
s,s1,s2 : TCmdStr;
linkdynamic : boolean;
@ -438,40 +474,7 @@ begin
{ set special options for some targets }
if not IsDarwin Then
begin
if isdll and
(target_info.system in systems_bsd) then
begin
prtobj:='dllprt0';
cprtobj:='dllprt0';
gprtobj:='dllprt0';
end
else
begin
prtobj:='prt0';
cprtobj:='cprt0';
gprtobj:='gprt0';
end;
linkdynamic:=not(SharedLibFiles.empty);
// this one is a bit complex.
// Only reorder for now if -XL or -XO params are given
// or when -Xf.
reorder:= linklibc and
(
ReorderEntries
or
(cs_link_pthread in current_settings.globalswitches));
if cs_profile in current_settings.moduleswitches then
begin
prtobj:=gprtobj;
AddSharedLibrary('c');
LibrarySuffix:='p';
linklibc:=true;
end
else
begin
if linklibc then
prtobj:=cprtobj;
end;
// after this point addition of shared libs not allowed.
end
else
@ -483,8 +486,6 @@ begin
else
AddSharedLibrary('SystemStubs_profile');
{$endif MACOSX104ORHIGHER}
reorder:=reorderentries;
prtobj:='';
end;
if reorder Then