From 8155d759dcd9f7404e0db84f18df279ec2a41682 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Thu, 24 Sep 2015 06:44:12 +0000 Subject: [PATCH] - reverted r31806, it breaks building on non-Darwin (mantis #28716) git-svn-id: trunk@31807 - --- compiler/aarch64/agcpugas.pas | 4 ++-- compiler/arm/agarmgas.pas | 4 ++-- compiler/assemble.pas | 4 ++-- compiler/ppcgen/agppcgas.pas | 5 +++-- compiler/systems.inc | 1 + compiler/systems/i_bsd.pas | 32 ++++++++++++++++---------------- compiler/x86/agx86att.pas | 10 ++++++---- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/compiler/aarch64/agcpugas.pas b/compiler/aarch64/agcpugas.pas index 65ffccd091..a5c14bf586 100644 --- a/compiler/aarch64/agcpugas.pas +++ b/compiler/aarch64/agcpugas.pas @@ -297,8 +297,8 @@ unit agcpugas; as_aarch64_gas_darwin_info : tasminfo = ( - id : as_gas; - idtxt : 'AS'; + id : as_darwin; + idtxt : 'AS-Darwin'; asmbin : 'as'; asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch arm64'; supported_targets : [system_aarch64_darwin]; diff --git a/compiler/arm/agarmgas.pas b/compiler/arm/agarmgas.pas index c0877e9cf4..9a37cc4667 100644 --- a/compiler/arm/agarmgas.pas +++ b/compiler/arm/agarmgas.pas @@ -413,8 +413,8 @@ unit agarmgas; as_arm_gas_darwin_info : tasminfo = ( - id : as_gas; - idtxt : 'AS'; + id : as_darwin; + idtxt : 'AS-Darwin'; asmbin : 'as'; asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch $ARCH'; supported_targets : [system_arm_darwin]; diff --git a/compiler/assemble.pas b/compiler/assemble.pas index 6943128870..1b9cf3766d 100644 --- a/compiler/assemble.pas +++ b/compiler/assemble.pas @@ -735,7 +735,7 @@ Implementation begin DoPipe:=(cs_asm_pipe in current_settings.globalswitches) and (([cs_asm_extern,cs_asm_leave,cs_link_on_target] * current_settings.globalswitches) = []) and - ((asminfo^.id in [as_gas,as_ggas,as_powerpc_xcoff])); + ((asminfo^.id in [as_gas,as_ggas,as_darwin,as_powerpc_xcoff])); end; @@ -2174,7 +2174,7 @@ Implementation var asmkind: tasm; begin - for asmkind in [as_gas,as_ggas] do + for asmkind in [as_gas,as_ggas,as_darwin] do if assigned(asminfos[asmkind]) and (target_info.system in asminfos[asmkind]^.supported_targets) then begin diff --git a/compiler/ppcgen/agppcgas.pas b/compiler/ppcgen/agppcgas.pas index 59b74c9af3..67180a3147 100644 --- a/compiler/ppcgen/agppcgas.pas +++ b/compiler/ppcgen/agppcgas.pas @@ -553,8 +553,9 @@ unit agppcgas; as_ppc_gas_darwin_powerpc_info : tasminfo = ( - id : as_gas; - idtxt : 'AS'; + id : as_darwin; + + idtxt : 'AS-Darwin'; asmbin : 'as'; asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch $ARCH'; supported_targets : [system_powerpc_darwin,system_powerpc64_darwin]; diff --git a/compiler/systems.inc b/compiler/systems.inc index f91cc39c8a..bd7ea8a090 100644 --- a/compiler/systems.inc +++ b/compiler/systems.inc @@ -193,6 +193,7 @@ ,as_i386_pecoffwdosx ,as_m68k_mit ,as_powerpc_mpw + ,as_darwin ,as_i386_macho ,as_x86_64_masm ,as_x86_64_pecoff diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas index f4ae3ea9d2..05aa56e6ab 100644 --- a/compiler/systems/i_bsd.pas +++ b/compiler/systems/i_bsd.pas @@ -676,8 +676,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -741,8 +741,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -806,8 +806,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -871,8 +871,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -936,8 +936,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -1000,8 +1000,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -1064,8 +1064,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; @@ -1129,8 +1129,8 @@ unit i_bsd; Cprefix : '_'; newline : #10; dirsep : '/'; - assem : as_gas; - assemextern : as_gas; + assem : as_darwin; + assemextern : as_darwin; link : ld_none; linkextern : ld_bsd; ar : ar_gnu_ar; diff --git a/compiler/x86/agx86att.pas b/compiler/x86/agx86att.pas index 70fc68157a..35dcef0cd9 100644 --- a/compiler/x86/agx86att.pas +++ b/compiler/x86/agx86att.pas @@ -469,10 +469,12 @@ interface dollarsign: '$'; ); + + as_x86_64_gas_darwin_info : tasminfo = ( - id : as_gas; - idtxt : 'AS'; + id : as_darwin; + idtxt : 'AS-Darwin'; asmbin : 'as'; asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch x86_64'; supported_targets : [system_x86_64_darwin,system_x86_64_iphonesim]; @@ -532,8 +534,8 @@ interface as_i386_gas_darwin_info : tasminfo = ( - id : as_gas; - idtxt : 'AS'; + id : as_darwin; + idtxt : 'AS-Darwin'; asmbin : 'as'; asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch i386'; supported_targets : [system_i386_darwin,system_i386_iphonesim];