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

* small fix for go32v2

Browse Source
This commit is contained in:
peter 1998-05-04 20:19:54 +00:00
parent f1c07fc262
commit a213e8adb4
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/link.pas
View File

@ -25,7 +25,7 @@ Unit link;
Interface Interface
uses cobjects,dos; uses cobjects;
Type Type
TLinker = Object TLinker = Object
@ -66,15 +66,21 @@ Var
Implementation Implementation
uses uses
Script,globals,systems,linux,dos,verbose; Script,globals,systems,verbose
{$ifdef linux}
,linux
{$endif}
,dos;
{$ifndef linux} {$ifndef linux}
Procedure Shell(command:string); Procedure Shell(command:string);
{ This is already defined in the linux.ppu for linux, need for the * { This is already defined in the linux.ppu for linux, need for the *
expansion under linux } expansion under linux }
var
comspec : string;
begin begin
shell:=getenv('COMSPEC'); comspec:=getenv('COMSPEC');
Exec(shell,command); Exec(comspec,' /C '+command);
end; end;
{$endif} {$endif}
@ -332,10 +338,10 @@ begin
LinkOptions:='-dynamic-linker='+DynamicLinker+' '+LinkOptions; LinkOptions:='-dynamic-linker='+DynamicLinker+' '+LinkOptions;
if Strip then if Strip then
LinkOptions:=LinkOptions+target_link.stripopt; LinkOptions:=LinkOptions+target_link.stripopt;
{ Write used files and libraries } { Write used files and libraries }
WriteResponseFile; WriteResponseFile;
{ Call linker } { Call linker }
if not externlink then if not externlink then
Message1(exec_i_linking,ExeName); Message1(exec_i_linking,ExeName);
@ -344,7 +350,7 @@ begin
Replace(s,'$OPT',LinkOptions); Replace(s,'$OPT',LinkOptions);
Replace(s,'$RES',inputdir+LinkResName); Replace(s,'$RES',inputdir+LinkResName);
success:=DoExec(FindLinker,s,true); success:=DoExec(FindLinker,s,true);
{Bind} {Bind}
if target_info.target=target_os2 then if target_info.target=target_os2 then
begin begin
@ -422,7 +428,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.4 1998-05-04 17:54:25 peter Revision 1.5 1998-05-04 20:19:54 peter
* small fix for go32v2
Revision 1.4 1998/05/04 17:54:25 peter
+ smartlinking works (only case jumptable left todo) + smartlinking works (only case jumptable left todo)
* redesign of systems.pas to support assemblers and linkers * redesign of systems.pas to support assemblers and linkers
+ Unitname is now also in the PPU-file, increased version to 14 + Unitname is now also in the PPU-file, increased version to 14

19
compiler/systems.pas
View File

@ -73,7 +73,7 @@ unit systems;
tlinkinfo = record tlinkinfo = record
linkbin : string[8]; linkbin : string[8];
linkcmd : string[40]; linkcmd : string[50];
stripopt : string[2]; stripopt : string[2];
groupstart, groupstart,
groupend, groupend,
@ -283,16 +283,14 @@ unit systems;
libprefix : '-l' libprefix : '-l'
) )
{$ifdef i386} {$ifdef i386}
,( ,(
linkbin : 'ld'; linkbin : 'ld';
linkcmd : '-oformat coff-go32 $OPT -o $EXE @$RES'; linkcmd : '-oformat coff-go32 $OPT -o $EXE @$RES';
stripopt : '-s'; stripopt : '-s';
groupstart : '-('; groupstart : '-(';
groupend : ')-'; groupend : ')-';
inputstart : 'INPUT('; inputstart : '';
inputend : ')'; inputend : '';
libprefix : '-l' libprefix : '-l'
) )
,( ,(
@ -301,8 +299,8 @@ unit systems;
stripopt : '-s'; stripopt : '-s';
groupstart : '-('; groupstart : '-(';
groupend : ')-'; groupend : ')-';
inputstart : 'INPUT('; inputstart : '';
inputend : ')'; inputend : '';
libprefix : '-l' libprefix : '-l'
) )
,( ,(
@ -326,8 +324,6 @@ unit systems;
libprefix : '' libprefix : ''
) )
{$endif i386} {$endif i386}
); );
target_infos : array[ttarget] of ttargetinfo = ( target_infos : array[ttarget] of ttargetinfo = (
@ -520,7 +516,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.7 1998-05-04 17:54:29 peter Revision 1.8 1998-05-04 20:19:54 peter
* small fix for go32v2
Revision 1.7 1998/05/04 17:54:29 peter
+ smartlinking works (only case jumptable left todo) + smartlinking works (only case jumptable left todo)
* redesign of systems.pas to support assemblers and linkers * redesign of systems.pas to support assemblers and linkers
+ Unitname is now also in the PPU-file, increased version to 14 + Unitname is now also in the PPU-file, increased version to 14