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

* modified patch by Mark Morgan Lloyd to pass cpu type to the assembler, resolves #23390

Browse Source 
git-svn-id: trunk@23107 -
This commit is contained in:
florian 2012-12-03 21:54:37 +00:00
parent 2642345c1b
commit 69d96d9bf9
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/globals.pas
View File

@ -418,8 +418,8 @@ interface
fputype : fpu_standard; fputype : fpu_standard;
{$endif POWERPC64} {$endif POWERPC64}
{$ifdef sparc} {$ifdef sparc}
cputype : cpu_SPARC_V8; cputype : cpu_SPARC_V9;
optimizecputype : cpu_SPARC_V8; optimizecputype : cpu_SPARC_V9;
fputype : fpu_hard; fputype : fpu_hard;
{$endif sparc} {$endif sparc}
{$ifdef arm} {$ifdef arm}

31
compiler/sparc/cpugas.pas
View File

@ -28,11 +28,13 @@ interface
uses uses
cpubase, cpubase,
aasmtai,aasmdata,aasmcpu,assemble,aggas, aasmtai,aasmdata,aasmcpu,assemble,aggas,
cgutils; cgutils,globtype;
type type
TGasSPARC=class(TGnuAssembler) TGasSPARC=class(TGnuAssembler)
constructor create(smart: boolean); override; constructor create(smart: boolean); override;
{# Constructs the command line for calling the assembler }
function MakeCmdLine: TCmdStr; override;
end; end;
TSPARCInstrWriter=class(TCPUInstrWriter) TSPARCInstrWriter=class(TCPUInstrWriter)
@ -44,7 +46,7 @@ interface
implementation implementation
uses uses
cutils,systems,procinfo, cutils,systems,globals,cpuinfo,procinfo,
verbose,itcpugas,cgbase; verbose,itcpugas,cgbase;
@ -59,6 +61,27 @@ implementation
end; end;
function TGasSPARC.MakeCmdLine: TCmdStr;
begin
result := Inherited MakeCmdLine;
{ ARCH selection }
// Note for casual readers: gas (GNU as) uses -Av7, -Av8, -Av9 etc. on SPARC,
// rather than variants of the -m option used by most other CPUs. Solaris as
// uses -xarch=v7, -xarch=v8 etc., that form is not supported here since there
// are probably other incompatibilties between the GNU and Solaris binutils
// that need to be reviewed.
//
// v9 is required as the default since the RTL started using membar at 2.2.2.
case current_settings.cputype of
cpu_SPARC_V7: Replace(result,'$ARCH','-Av7');
cpu_SPARC_V8: Replace(result,'$ARCH','-Av8')
else
Replace(result,'$ARCH','-Av9')
end
end;
function TSPARCInstrWriter.GetReferenceString(var ref:TReference):string; function TSPARCInstrWriter.GetReferenceString(var ref:TReference):string;
var var
asm_comment : string; asm_comment : string;
@ -243,7 +266,7 @@ implementation
{$ifdef FPC_SPARC_V8_ONLY} {$ifdef FPC_SPARC_V8_ONLY}
asmcmd : '$PIC -o $OBJ $ASM'; asmcmd : '$PIC -o $OBJ $ASM';
{$else} {$else}
asmcmd : '$PIC -Av9 -o $OBJ $ASM'; asmcmd : '$ARCH $PIC -o $OBJ $ASM';
{$endif} {$endif}
supported_targets : [system_sparc_solaris,system_sparc_linux,system_sparc_embedded]; supported_targets : [system_sparc_solaris,system_sparc_linux,system_sparc_embedded];
flags : [af_needar,af_smartlink_sections]; flags : [af_needar,af_smartlink_sections];
@ -257,7 +280,7 @@ implementation
id : as_ggas; id : as_ggas;
idtxt : 'GAS'; idtxt : 'GAS';
asmbin : 'gas'; asmbin : 'gas';
asmcmd : '$PIC -Av9 -o $OBJ $ASM'; asmcmd : '$ARCH $PIC -o $OBJ $ASM';
supported_targets : [system_sparc_solaris,system_sparc_linux,system_sparc_embedded]; supported_targets : [system_sparc_solaris,system_sparc_linux,system_sparc_embedded];
flags : [af_needar,af_smartlink_sections]; flags : [af_needar,af_smartlink_sections];
labelprefix : '.L'; labelprefix : '.L';