paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 13:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix mantis #25129 for non OS X BSD systems. Patch by A. Cardenas Marquez

Browse Source 
- crtbegin and crtend suffix handling
     - crti before crtbegin

git-svn-id: trunk@25620 -
This commit is contained in:
marco 2013-10-02 09:05:32 +00:00
parent 1f0c70508f
commit 2a9916baba
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/systems/t_bsd.pas
View File

@ -489,10 +489,19 @@ begin
if linklibc and
not IsDarwin Then
begin
if librarysearchpath.FindFile('crtbegin.o',false,s) then
LinkRes.AddFileName(s);
if librarysearchpath.FindFile('crti.o',false,s) then
LinkRes.AddFileName(s);
if cs_create_pic in current_settings.moduleswitches then
begin
if librarysearchpath.FindFile('crtbeginS.o',false,s) then
LinkRes.AddFileName(s);
end
else
if (cs_link_staticflag in current_settings.globalswitches) and
librarysearchpath.FindFile('crtbeginT.o',false,s) then
LinkRes.AddFileName(s)
else if librarysearchpath.FindFile('crtbegin.o',false,s) then
LinkRes.AddFileName(s);
end;
{ main objectfiles }
while not ObjectFiles.Empty do
@ -577,7 +586,10 @@ begin
if linklibc and
not IsDarwin Then
begin
Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
if cs_create_pic in current_settings.moduleswitches then
Fl1:=librarysearchpath.FindFile('crtendS.o',false,s1)
else
Fl1:=librarysearchpath.FindFile('crtend.o',false,s1);
Fl2:=librarysearchpath.FindFile('crtn.o',false,s2);
if Fl1 or Fl2 then
begin