paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 18:49:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

try to do VLink support semi-properly, so cross compilation is possible

Browse Source 
git-svn-id: trunk@24664 -
This commit is contained in:
Károly Balogh 2013-05-31 13:04:44 +00:00
parent 1551c773e0
commit af1f84892c
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/systems/t_morph.pas
View File

@ -38,6 +38,7 @@ implementation
PlinkerMorphOS=^TlinkerMorphOS; PlinkerMorphOS=^TlinkerMorphOS;
TlinkerMorphOS=class(texternallinker) TlinkerMorphOS=class(texternallinker)
private private
UseVLink: Boolean;
Function WriteResponseFile(isdll:boolean) : Boolean; Function WriteResponseFile(isdll:boolean) : Boolean;
public public
constructor Create; override; constructor Create; override;
@ -56,6 +57,13 @@ begin
{ allow duplicated libs (PM) } { allow duplicated libs (PM) }
SharedLibFiles.doubles:=true; SharedLibFiles.doubles:=true;
StaticLibFiles.doubles:=true; StaticLibFiles.doubles:=true;
{ TODO: always use vlink on MorphOS for now, but allow ld for cross compiling,
we need a command line switch to switch between vlink and ld later. (KB) }
{$IFDEF MORPHOS}
UseVLink:=true;
{$ELSE}
UseVLink:=(cs_link_on_target in current_settings.globalswitches);
{$ENDIF}
end; end;
@ -63,7 +71,7 @@ procedure TLinkerMorphOS.SetDefaultInfo;
begin begin
with Info do with Info do
begin begin
if (cs_link_on_target in current_settings.globalswitches) then if not UseVLink then
begin begin
ExeCmd[1]:='ld $OPT -o $EXE $RES'; ExeCmd[1]:='ld $OPT -o $EXE $RES';
ExeCmd[2]:='strip --strip-unneeded --remove-section .comment $EXE'; ExeCmd[2]:='strip --strip-unneeded --remove-section .comment $EXE';
@ -94,7 +102,7 @@ begin
while assigned(HPath) do while assigned(HPath) do
begin begin
s:=HPath.Str; s:=HPath.Str;
if (cs_link_on_target in current_settings.globalswitches) then if not (cs_link_on_target in current_settings.globalswitches) then
s:=ScriptFixFileName(s); s:=ScriptFixFileName(s);
LinkRes.Add('-L'+s); LinkRes.Add('-L'+s);
HPath:=TCmdStrListItem(HPath.Next); HPath:=TCmdStrListItem(HPath.Next);
@ -118,7 +126,7 @@ begin
if s<>'' then if s<>'' then
begin begin
{ vlink doesn't use SEARCH_DIR for object files } { vlink doesn't use SEARCH_DIR for object files }
if not(cs_link_on_target in current_settings.globalswitches) then if UseVLink then
s:=FindObjectFile(s,'',false); s:=FindObjectFile(s,'',false);
LinkRes.AddFileName(Unix2AmigaPath(maybequoted(s))); LinkRes.AddFileName(Unix2AmigaPath(maybequoted(s)));
end; end;
@ -128,7 +136,7 @@ begin
if not StaticLibFiles.Empty then if not StaticLibFiles.Empty then
begin begin
{ vlink doesn't need, and doesn't support GROUP } { vlink doesn't need, and doesn't support GROUP }
if (cs_link_on_target in current_settings.globalswitches) then if not UseVLink then
begin begin
LinkRes.Add(')'); LinkRes.Add(')');
LinkRes.Add('GROUP('); LinkRes.Add('GROUP(');
@ -140,7 +148,7 @@ begin
end; end;
end; end;
if (cs_link_on_target in current_settings.globalswitches) then if not UseVLink then
begin begin
LinkRes.Add(')'); LinkRes.Add(')');
@ -201,7 +209,7 @@ begin
if not(cs_link_nolink in current_settings.globalswitches) then if not(cs_link_nolink in current_settings.globalswitches) then
Message1(exec_i_linking,current_module.exefilename); Message1(exec_i_linking,current_module.exefilename);
if not (cs_link_on_target in current_settings.globalswitches) then if UseVLink then
begin begin
StripStr:=''; StripStr:='';
if (cs_link_strip in current_settings.globalswitches) then if (cs_link_strip in current_settings.globalswitches) then
@ -214,7 +222,7 @@ begin
{ Call linker } { Call linker }
SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr); SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
Replace(cmdstr,'$OPT',Info.ExtraOptions); Replace(cmdstr,'$OPT',Info.ExtraOptions);
if not(cs_link_on_target in current_settings.globalswitches) then if UseVLink then
begin begin
Replace(cmdstr,'$EXE',Unix2AmigaPath(maybequoted(ScriptFixFileName(current_module.exefilename)))); Replace(cmdstr,'$EXE',Unix2AmigaPath(maybequoted(ScriptFixFileName(current_module.exefilename))));
Replace(cmdstr,'$RES',Unix2AmigaPath(maybequoted(ScriptFixFileName(outputexedir+Info.ResName)))); Replace(cmdstr,'$RES',Unix2AmigaPath(maybequoted(ScriptFixFileName(outputexedir+Info.ResName))));
@ -225,13 +233,13 @@ begin
Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(current_module.exefilename))); Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(current_module.exefilename)));
Replace(cmdstr,'$RES',maybequoted(ScriptFixFileName(outputexedir+Info.ResName))); Replace(cmdstr,'$RES',maybequoted(ScriptFixFileName(outputexedir+Info.ResName)));
end; end;
success:=DoExec(FindUtil(BinStr),cmdstr,true,false); success:=DoExec(FindUtil(utilsprefix+BinStr),cmdstr,true,false);
{ Stripping Enabled? } { Stripping Enabled? }
{ For MorphOS a separate strip command is needed, to avoid stripping } { For MorphOS ld a separate strip command is needed, to avoid stripping }
{ __abox__ symbol, which is required to be present in current MorphOS } { __abox__ symbol, which is required to be present in current MorphOS }
{ executables. } { executables. }
if (cs_link_on_target in current_settings.globalswitches) then if not UseVLink then
begin begin
if success and (cs_link_strip in current_settings.globalswitches) then if success and (cs_link_strip in current_settings.globalswitches) then
begin begin