* Reverse-merged /trunk:r47746

git-svn-id: branches/fixes_3_2@48015 -
This commit is contained in:
marco 2021-01-03 15:55:57 +00:00
parent 679c1c9199
commit 7bc877cc94

View File

@ -82,7 +82,7 @@ begin
end
else
begin
ExeCmd[1]:='vlink -b amigahunk -e_start $MAP $GCSECTIONS $OPT $STRIP -o $EXE -T $RES';
ExeCmd[1]:='vlink -b amigahunk $GCSECTIONS $OPT $STRIP -o $EXE -T $RES';
end;
end;
end;
@ -97,7 +97,7 @@ begin
end
else
begin
ExeCmd[1]:='vlink -q -n -b elf32amigaos -P_start -P__amigaos4__ -nostdlib $MAP $GCSECTIONS $OPT $STRIP -o $EXE -T $RES';
ExeCmd[1]:='vlink -q -n -b elf32amigaos -P_start -P__amigaos4__ -nostdlib $GCSECTIONS $OPT $STRIP -o $EXE -T $RES';
end;
end;
end;
@ -347,15 +347,11 @@ var
StripStr: string[40];
DynLinkStr : string;
GCSectionsStr : string;
MapStr: string;
begin
StripStr:='';
GCSectionsStr:='';
DynLinkStr:='';
MapStr:='';
if UseVlink and (cs_link_map in current_settings.globalswitches) then
MapStr:='-M'+Unix2AmigaPath(maybequoted(ScriptFixFilename(current_module.mapfilename)));
if (cs_link_strip in current_settings.globalswitches) then
StripStr:='-s';
if rlinkpath<>'' Then
@ -372,7 +368,6 @@ begin
Replace(cmdstr,'$OPT',Info.ExtraOptions);
Replace(cmdstr,'$EXE',Unix2AmigaPath(maybequoted(ScriptFixFileName(current_module.exefilename))));
Replace(cmdstr,'$RES',Unix2AmigaPath(maybequoted(ScriptFixFileName(outputexedir+Info.ResName))));
Replace(cmdstr,'$MAP',MapStr);
Replace(cmdstr,'$STRIP',StripStr);
Replace(cmdstr,'$GCSECTIONS',GCSectionsStr);
Replace(cmdstr,'$DYNLINK',DynLinkStr);