Browse Source

- removed as_darwin, since there is no difference with as_gas (there is no
GNU as from binutils for Darwin, and Apple's "as" is based on an old
version of GNU as)
o this will not cause any backward compatibility problems, as the
previous identifier for as_darwin was "AS-Darwin" and the compiler
compared the uppercase value of the -A parameter to the identifier,
so it was not explicitly selectable earlier. The new name is "AS",
so it is explicitly selectable via -Aas like on other platforms.

git-svn-id: trunk@31806 -

Jonas Maebe 10 years ago
parent
commit
c0b451e788

+ 2 - 2
compiler/aarch64/agcpugas.pas

@@ -297,8 +297,8 @@ unit agcpugas;
 
        as_aarch64_gas_darwin_info : tasminfo =
           (
-            id     : as_darwin;
-            idtxt  : 'AS-Darwin';
+            id     : as_gas;
+            idtxt  : 'AS';
             asmbin : 'as';
             asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch arm64';
             supported_targets : [system_aarch64_darwin];

+ 2 - 2
compiler/arm/agarmgas.pas

@@ -413,8 +413,8 @@ unit agarmgas;
 
        as_arm_gas_darwin_info : tasminfo =
           (
-            id     : as_darwin;
-            idtxt  : 'AS-Darwin';
+            id     : as_gas;
+            idtxt  : 'AS';
             asmbin : 'as';
             asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch $ARCH';
             supported_targets : [system_arm_darwin];

+ 2 - 2
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_darwin,as_powerpc_xcoff]));
+                ((asminfo^.id in [as_gas,as_ggas,as_powerpc_xcoff]));
       end;
 
 
@@ -2174,7 +2174,7 @@ Implementation
       var
         asmkind: tasm;
       begin
-        for asmkind in [as_gas,as_ggas,as_darwin] do
+        for asmkind in [as_gas,as_ggas] do
           if assigned(asminfos[asmkind]) and
              (target_info.system in asminfos[asmkind]^.supported_targets) then
             begin

+ 2 - 3
compiler/ppcgen/agppcgas.pas

@@ -553,9 +553,8 @@ unit agppcgas;
 
     as_ppc_gas_darwin_powerpc_info : tasminfo =
        (
-         id     : as_darwin;
-
-         idtxt  : 'AS-Darwin';
+         id     : as_gas;
+         idtxt  : 'AS';
          asmbin : 'as';
          asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch $ARCH';
          supported_targets : [system_powerpc_darwin,system_powerpc64_darwin];

+ 0 - 1
compiler/systems.inc

@@ -193,7 +193,6 @@
              ,as_i386_pecoffwdosx
              ,as_m68k_mit
              ,as_powerpc_mpw
-             ,as_darwin
              ,as_i386_macho
              ,as_x86_64_masm
              ,as_x86_64_pecoff

+ 16 - 16
compiler/systems/i_bsd.pas

@@ -676,8 +676,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -741,8 +741,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -806,8 +806,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -871,8 +871,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -936,8 +936,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -1000,8 +1000,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -1064,8 +1064,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;
@@ -1129,8 +1129,8 @@ unit i_bsd;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_darwin;
-            assemextern  : as_darwin;
+            assem        : as_gas;
+            assemextern  : as_gas;
             link         : ld_none;
             linkextern   : ld_bsd;
             ar           : ar_gnu_ar;

+ 4 - 6
compiler/x86/agx86att.pas

@@ -469,12 +469,10 @@ interface
             dollarsign: '$';
           );
 
-
-
        as_x86_64_gas_darwin_info : tasminfo =
           (
-            id     : as_darwin;
-            idtxt  : 'AS-Darwin';
+            id     : as_gas;
+            idtxt  : 'AS';
             asmbin : 'as';
             asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch x86_64';
             supported_targets : [system_x86_64_darwin,system_x86_64_iphonesim];
@@ -534,8 +532,8 @@ interface
 
        as_i386_gas_darwin_info : tasminfo =
           (
-            id     : as_darwin;
-            idtxt  : 'AS-Darwin';
+            id     : as_gas;
+            idtxt  : 'AS';
             asmbin : 'as';
             asmcmd : '-o $OBJ $EXTRAOPT $ASM -arch i386';
             supported_targets : [system_i386_darwin,system_i386_iphonesim];