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

Merged revisions 2590-2591 via svnmerge from

Browse Source 
svn+ssh://jonas@svn.freepascal.org/FPC/svn/fpc/trunk

........
r2590 | jonas | 2006-02-15 12:00:09 +0100 (Wed, 15 Feb 2006) | 3 lines

  + add "-arch ppc" to the assembler call to fix assembling when
    running on x86

........
r2591 | jonas | 2006-02-15 12:01:25 +0100 (Wed, 15 Feb 2006) | 3 lines

  * assembling via a pipe and regular assembling now both use the
    same binary and command line

........

git-svn-id: branches/fixes_2_0@2672 -
This commit is contained in:
Jonas Maebe 2006-02-23 12:09:04 +00:00
parent 559e4e652a
commit 459b34e172
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
compiler/assemble.pas
View File

@ -122,6 +122,9 @@ interface
to actually write all the different abstract assembler streams
by calling for each stream type, the @var(WriteTree) method.}
procedure WriteAsmList;virtual;
{# Constructs the command line for calling the assembler }
function MakeCmdLine: TCmdStr;
public
Constructor Create(smart:boolean);override;
procedure MakeObject;override;
@ -262,8 +265,8 @@ Implementation
Function DoPipe:boolean;
begin
DoPipe:=(cs_asm_pipe in aktglobalswitches) and
not(cs_asm_leave in aktglobalswitches)
and ((aktoutputformat in [as_gas,as_darwin]));
(([cs_asm_leave,cs_link_on_target] * aktglobalswitches) = []) and
((target_asm.id in [as_gas,as_darwin]));
end;
@ -456,24 +459,8 @@ Implementation
else
Message1(exec_i_assembling,name);
end;
s:=target_asm.asmcmd;
{$ifdef m68k}
if aktoptprocessor = MC68020 then
s:='-m68020 '+s
else
s:='-m68000 '+s;
{$endif}
if (cs_link_on_target in aktglobalswitches) then
begin
Replace(s,'$ASM',maybequoted(ScriptFixFileName(AsmFile)));
Replace(s,'$OBJ',maybequoted(ScriptFixFileName(ObjFile)));
end
else
begin
Replace(s,'$ASM',maybequoted(AsmFile));
Replace(s,'$OBJ',maybequoted(ObjFile));
end;
if CallAssembler(FindAssembler,s) then
if CallAssembler(FindAssembler,MakeCmdLine) then
RemoveAsm
else
begin
@ -570,13 +557,33 @@ Implementation
end;
end;
{$ifdef i386}
const format_option='--32';
{$else}{$ifdef x86_64}
const format_option='--64';
{$else}
const format_option='';
{$endif}{$endif}
function TExternalAssembler.MakeCmdLine: TCmdStr;
begin
result:=target_asm.asmcmd;
{$ifdef m68k}
if aktoptprocessor = MC68020 then
result:='-m68020 '+result
else
result:='-m68000 '+result;
{$endif}
if (cs_link_on_target in aktglobalswitches) then
begin
Replace(result,'$ASM',maybequoted(ScriptFixFileName(AsmFile)));
Replace(result,'$OBJ',maybequoted(ScriptFixFileName(ObjFile)));
end
else
begin
{$ifdef hasunix}
if DoPipe then
Replace(result,'$ASM','')
else
{$endif}
Replace(result,'$ASM',maybequoted(AsmFile));
Replace(result,'$OBJ',maybequoted(ObjFile));
end;
end;
procedure TExternalAssembler.AsmCreate(Aplace:tcutplace);
begin
@ -586,7 +593,7 @@ Implementation
if DoPipe then
begin
Message1(exec_i_assembling_pipe,asmfile);
POpen(outfile,'as '+format_option+' -o '+objfile,'W');
POpen(outfile,FindAssembler+' '+MakeCmdLine,'W');
end
else
{$endif}

6
compiler/powerpc/agppcgas.pas
View File

@ -80,13 +80,13 @@ unit agppcgas;
);
as_ppc_gas_darwin_info : tasminfo =
as_ppc_gas_darwin_powerpc_info : tasminfo =
(
id : as_darwin;
idtxt : 'AS-Darwin';
asmbin : 'as';
asmcmd : '-o $OBJ $ASM';
asmcmd : '-o $OBJ $ASM -arch ppc';
supported_target : system_any;
flags : [af_allowdirect,af_needar,af_smartlink_sections];
labelprefix : 'L';
@ -367,5 +367,5 @@ unit agppcgas;
begin
RegisterAssembler(as_ppc_gas_info,TPPCGNUAssembler);
RegisterAssembler(as_ppc_gas_darwin_info,TPPCGNUAssembler);
RegisterAssembler(as_ppc_gas_darwin_powerpc_info,TPPCGNUAssembler);
end.