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

* fixed wrong merge

Browse Source 
git-svn-id: trunk@2990 -
This commit is contained in:
peter 2006-03-20 16:52:58 +00:00
parent 096113d370
commit d3fa4dbca2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/systems/t_win.pas
View File

@ -898,8 +898,8 @@ begin
{$else ARM} {$else ARM}
targetopts:='-b pe-i386 -m i386pe'; targetopts:='-b pe-i386 -m i386pe';
{$endif ARM} {$endif ARM}
ExeCmd[1]:='ld '+targetopts+' $OPT $GCSECTIONS $STRIP $APPTYPE $ENTRY $IMAGEBASE $RELOC -o $EXE $RES'; ExeCmd[1]:='ld '+targetopts+' $OPT $GCSECTIONS $MAP $STRIP $APPTYPE $ENTRY $IMAGEBASE $RELOC -o $EXE $RES';
DllCmd[1]:='ld '+targetopts+' $OPT $GCSECTIONS $STRIP --dll $APPTYPE $ENTRY $IMAGEBASE $RELOC -o $EXE $RES'; DllCmd[1]:='ld '+targetopts+' $OPT $GCSECTIONS $MAP $STRIP --dll $APPTYPE $ENTRY $IMAGEBASE $RELOC -o $EXE $RES';
{ ExeCmd[2]:='dlltool --as $ASBIN --dllname $EXE --output-exp exp.$$$ $RELOC $DEF'; { ExeCmd[2]:='dlltool --as $ASBIN --dllname $EXE --output-exp exp.$$$ $RELOC $DEF';
use short forms to avoid 128 char limitation problem } use short forms to avoid 128 char limitation problem }
ExeCmd[2]:='dlltool -S $ASBIN -D $EXE -e exp.$$$ $RELOC $DEF'; ExeCmd[2]:='dlltool -S $ASBIN -D $EXE -e exp.$$$ $RELOC $DEF';
@ -1128,8 +1128,8 @@ begin
{ Write and Close response } { Write and Close response }
writetodisk; writetodisk;
end;
Free; Free;
end;
WriteResponseFile:=True; WriteResponseFile:=True;
end; end;
@ -1143,6 +1143,7 @@ var
cmds,i : longint; cmds,i : longint;
AsBinStr : string[80]; AsBinStr : string[80];
GCSectionsStr, GCSectionsStr,
MapStr,
StripStr, StripStr,
RelocStr, RelocStr,
AppTypeStr, AppTypeStr,
@ -1158,6 +1159,7 @@ begin
EntryStr:=''; EntryStr:='';
ImageBaseStr:=''; ImageBaseStr:='';
StripStr:=''; StripStr:='';
MapStr:='';
GCSectionsStr:=''; GCSectionsStr:='';
AsBinStr:=FindUtil(utilsprefix+'as'); AsBinStr:=FindUtil(utilsprefix+'as');
if RelocSection then if RelocSection then
@ -1180,7 +1182,7 @@ begin
if (cs_link_strip in aktglobalswitches) then if (cs_link_strip in aktglobalswitches) then
StripStr:='-s'; StripStr:='-s';
if (cs_link_map in aktglobalswitches) then if (cs_link_map in aktglobalswitches) then
StripStr:='-Map '+maybequoted(ForceExtension(current_module.exefilename^,'.map')); MapStr:='-Map '+maybequoted(ForceExtension(current_module.exefilename^,'.map'));
{ Write used files and libraries } { Write used files and libraries }
WriteResponseFile(false); WriteResponseFile(false);
@ -1206,6 +1208,7 @@ begin
Replace(cmdstr,'$IMAGEBASE',ImageBaseStr); Replace(cmdstr,'$IMAGEBASE',ImageBaseStr);
Replace(cmdstr,'$GCSECTIONS',GCSectionsStr); Replace(cmdstr,'$GCSECTIONS',GCSectionsStr);
Replace(cmdstr,'$STRIP',StripStr); Replace(cmdstr,'$STRIP',StripStr);
Replace(cmdstr,'$MAP',MapStr);
if not DefFile.Empty then if not DefFile.Empty then
begin begin
DefFile.WriteFile; DefFile.WriteFile;