Explorar o código

* fixed compilation after previous merge

git-svn-id: branches/hlcgllvm@30106 -
Jonas Maebe %!s(int64=10) %!d(string=hai) anos
pai
achega
ea00e559f8
Modificáronse 3 ficheiros con 6 adicións e 5 borrados
  1. 3 3
      compiler/llvm/hlcgllvm.pas
  2. 2 1
      compiler/llvm/llvmbase.pas
  3. 1 1
      compiler/llvm/nllvmtcon.pas

+ 3 - 3
compiler/llvm/hlcgllvm.pas

@@ -117,7 +117,7 @@ uses
 {$endif cpuflags}
 {$endif cpuflags}
 
 
       { unimplemented or unnecessary routines }
       { unimplemented or unnecessary routines }
-      procedure a_bit_scan_reg_reg(list: TAsmList; reverse: boolean; size: tdef; src, dst: tregister); override;
+      procedure a_bit_scan_reg_reg(list: TAsmList; reverse: boolean; srcsize, dstsize: tdef; src, dst: tregister); override;
       procedure g_stackpointer_alloc(list: TAsmList; size: longint); override;
       procedure g_stackpointer_alloc(list: TAsmList; size: longint); override;
       procedure g_intf_wrapper(list: TAsmList; procdef: tprocdef; const labelname: string; ioffset: longint); override;
       procedure g_intf_wrapper(list: TAsmList; procdef: tprocdef; const labelname: string; ioffset: longint); override;
       procedure g_adjust_self_value(list: TAsmList; procdef: tprocdef; ioffset: aint); override;
       procedure g_adjust_self_value(list: TAsmList; procdef: tprocdef; ioffset: aint); override;
@@ -1114,7 +1114,7 @@ implementation
     var
     var
       hreg: tregister;
       hreg: tregister;
     begin
     begin
-      hreg:=getaddresregister(list,todef);
+      hreg:=getaddressregister(list,todef);
       a_loadaddr_ref_reg(list,fromdef.pointeddef,todef,ref,hreg);
       a_loadaddr_ref_reg(list,fromdef.pointeddef,todef,ref,hreg);
       reference_reset_base(ref,todef,hreg,0,ref.alignment);
       reference_reset_base(ref,todef,hreg,0,ref.alignment);
     end;
     end;
@@ -1373,7 +1373,7 @@ implementation
     end;
     end;
 
 
 
 
-  procedure thlcgllvm.a_bit_scan_reg_reg(list: TAsmList; reverse: boolean; size: tdef; src, dst: tregister);
+  procedure thlcgllvm.a_bit_scan_reg_reg(list: TAsmList; reverse: boolean; srcsize, dstsize: tdef; src, dst: tregister);
     begin
     begin
       internalerror(2012090201);
       internalerror(2012090201);
     end;
     end;

+ 2 - 1
compiler/llvm/llvmbase.pas

@@ -122,7 +122,8 @@ implementation
        'avr',
        'avr',
        'mipsel',
        'mipsel',
        'unknown',
        'unknown',
-       'unknown'
+       'unknown',
+       'aarch64'
       );
       );
 
 
   function llvm_target_name: ansistring;
   function llvm_target_name: ansistring;

+ 1 - 1
compiler/llvm/nllvmtcon.pas

@@ -118,7 +118,7 @@ implementation
       { todo }
       { todo }
       if section = sec_user then
       if section = sec_user then
         internalerror(2014052904);
         internalerror(2014052904);
-      newasmlist:=tasmlist.create_without_marker;
+      newasmlist:=tasmlist.create;
       { llvm declaration with as initialisation data all the elements from the
       { llvm declaration with as initialisation data all the elements from the
         original asmlist }
         original asmlist }
       newasmlist.concat(taillvmdecl.create(sym,def,fasmlist,section,alignment));
       newasmlist.concat(taillvmdecl.create(sym,def,fasmlist,section,alignment));