Bläddra i källkod

* made TAArch64ClangGASAssembler inherit from TAArch64Assembler and removed custom
$TARGET handling (handled by the general triple handling now)

git-svn-id: trunk@45808 -

Jonas Maebe 5 år sedan
förälder
incheckning
edb660ed58
1 ändrade filer med 1 tillägg och 29 borttagningar
  1. 1 29
      compiler/aarch64/agcpugas.pas

+ 1 - 29
compiler/aarch64/agcpugas.pas

@@ -47,16 +47,13 @@ unit agcpugas;
         constructor CreateWithWriter(info: pasminfo; wr: TExternalAssemblerOutputFile; freewriter, smart: boolean); override;
         constructor CreateWithWriter(info: pasminfo; wr: TExternalAssemblerOutputFile; freewriter, smart: boolean); override;
       end;
       end;
 
 
-      TAArch64ClangGASAssembler=class(TGNUassembler)
+      TAArch64ClangGASAssembler=class(TAArch64Assembler)
       private
       private
-        function TargetStr:String;
         procedure TransformSEHDirectives(list:TAsmList);
         procedure TransformSEHDirectives(list:TAsmList);
       protected
       protected
         function sectionflags(secflags:TSectionFlags):string;override;
         function sectionflags(secflags:TSectionFlags):string;override;
       public
       public
-        function MakeCmdLine:TCmdStr; override;
         procedure WriteAsmList; override;
         procedure WriteAsmList; override;
-        constructor CreateWithWriter(info: pasminfo; wr: TExternalAssemblerOutputFile; freewriter, smart: boolean); override;
       end;
       end;
 
 
     const
     const
@@ -105,24 +102,6 @@ unit agcpugas;
 {                      CLang AArch64 Assembler writer                        }
 {                      CLang AArch64 Assembler writer                        }
 {****************************************************************************}
 {****************************************************************************}
 
 
-    constructor TAArch64CLangGASAssembler.CreateWithWriter(info: pasminfo; wr: TExternalAssemblerOutputFile; freewriter, smart: boolean);
-      begin
-        inherited;
-        InstrWriter := TAArch64InstrWriter.create(self);
-      end;
-
-
-    function TAArch64ClangGASAssembler.TargetStr:String;
-      begin
-        case target_info.system of
-          system_aarch64_win64:
-            result:='aarch64-windows';
-          else
-            internalerror(2020032201);
-        end;
-      end;
-
-
     procedure TAArch64ClangGASAssembler.TransformSEHDirectives(list:TAsmList);
     procedure TAArch64ClangGASAssembler.TransformSEHDirectives(list:TAsmList);
 
 
       function convert_unwinddata(list:tasmlist):tdynamicarray;
       function convert_unwinddata(list:tasmlist):tdynamicarray;
@@ -574,13 +553,6 @@ unit agcpugas;
       end;
       end;
 
 
 
 
-    function TAArch64ClangGASAssembler.MakeCmdLine:TCmdStr;
-      begin
-        Result:=inherited MakeCmdLine;
-        Replace(Result,'$TARGET',TargetStr);
-      end;
-
-
     procedure TAArch64ClangGASAssembler.WriteAsmList;
     procedure TAArch64ClangGASAssembler.WriteAsmList;
       begin
       begin
         { clang does not support all the directives we need, so we need to
         { clang does not support all the directives we need, so we need to