- don't apply const_align() to alignments passed to high level typed

    constant builder, it will do so itself if necessary

git-svn-id: trunk@34632 -

compiler/aasmdef.pas

@@ -72,7 +72,7 @@ function TAsmDataDef.DefineAsmSymbolByClass(symclass: TAsmSymbolClass; const s:
           symind,ptrdef,
           sec_rodata,
           lower(symind.name),
-          const_align(ptrdef.alignment)));
+          ptrdef.alignment));
         tcb.free;
         if (_typ=AT_DATA_FORCEINDIRECT) and not (target_info.system in systems_indirect_var_imports) then
           current_module.add_public_asmsym(symind.name,AB_INDIRECT,AT_DATA);

compiler/cresstr.pas

@@ -170,7 +170,7 @@ uses
                 valuelab.lab:=nil;
                 valuelab.ofs:=0;
               end;
-            current_asmdata.asmlists[al_const].concat(cai_align.Create(const_align(sizeof(pint))));
+            current_asmdata.asmlists[al_const].concat(cai_align.Create(sizeof(pint)));
             namelab:=tcb.emit_ansistring_const(current_asmdata.asmlists[al_const],@R.Name[1],length(R.name),getansistringcodepage);
             {
               Resourcestring index:

compiler/ncgrtti.pas

@@ -1372,7 +1372,7 @@ implementation
             rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_o2s',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef);
             current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist(
               rttilab,tabledef,sec_rodata,
-              rttilab.name,const_align(sizeof(pint))));
+              rttilab.name,sizeof(pint)));
             tcb.free;
 
             current_module.add_public_asmsym(rttilab);
@@ -1419,7 +1419,7 @@ implementation
           rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_s2o',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef);
           current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist(
             rttilab,tabledef,sec_rodata,
-            rttilab.name,const_align(sizeof(pint))));
+            rttilab.name,sizeof(pint)));
           tcb.free;
 
           current_module.add_public_asmsym(rttilab);
@@ -1568,7 +1568,7 @@ implementation
         rttidef:=tcb.end_anonymous_record;
         rttilab:=current_asmdata.DefineAsmSymbol(tstoreddef(def).rtti_mangledname(rt),AB_GLOBAL,AT_DATA_FORCEINDIRECT,rttidef);
         current_asmdata.AsmLists[al_rtti].concatList(
-          tcb.get_final_asmlist(rttilab,rttidef,sec_rodata,rttilab.name,const_align(sizeof(pint))));
+          tcb.get_final_asmlist(rttilab,rttidef,sec_rodata,rttilab.name,sizeof(pint)));
         tcb.free;
 
         current_module.add_public_asmsym(rttilab);

compiler/ncgvmt.pas

@@ -445,7 +445,7 @@ implementation
            begin
               current_asmdata.getglobaldatalabel(r);
               gendmt:=r;
-              al_globals.concat(cai_align.create(const_align(sizeof(pint))));
+              al_globals.concat(cai_align.create(sizeof(pint)));
               al_globals.concat(Tai_label.Create(r));
               { entries for caching }
               al_globals.concat(Tai_const.Create_ptr(0));
@@ -930,7 +930,7 @@ implementation
             rec_tguid,
             sec_rodata,
             s,
-            const_align(sizeof(pint))));
+            sizeof(pint)));
           tcb.free;
           current_module.add_public_asmsym(sym);
         end;
@@ -1238,7 +1238,7 @@ implementation
          current_asmdata.asmlists[al_globals].concatlist(
            tcb.get_final_asmlist(
              sym,
-             vmtdef,sec_rodata,_class.vmt_mangledname,const_align(sizeof(pint))
+             vmtdef,sec_rodata,_class.vmt_mangledname,sizeof(pint)
            )
          );
          tcb.free;