Browse Source

* Merge 39989 to allow correct fullcycle with -O4

------------------------------------------------------------------------
r39989 | florian | 2018-10-20 09:16:51 +0000 (Sat, 20 Oct 2018) | 2 lines

* wrong ifdef exposed by warning with -O3 fixed

------------------------------------------------------------------------
--- Merging r39989 into '.':
U    compiler/ppcgen/hlcgppc.pas
--- Recording mergeinfo for merge of r39989 into '.':
 U   .

git-svn-id: branches/fixes_3_2@46286 -
pierre 5 years ago
parent
commit
922c95d317
1 changed files with 2 additions and 2 deletions
  1. 2 2
      compiler/ppcgen/hlcgppc.pas

+ 2 - 2
compiler/ppcgen/hlcgppc.pas

@@ -118,11 +118,11 @@ implementation
         reference_reset_base(href,voidpointertype,NR_R11,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),ctempposinvalid,sizeof(pint),[]);
         if tcgppcgen(cg).hasLargeOffset(href) then
           begin
-{$ifdef cpu64}
+{$ifdef cpu64bitaddr}
             if (longint(href.offset) <> href.offset) then
               { add support for offsets > 32 bit }
               internalerror(200510201);
-{$endif cpu64}
+{$endif cpu64bitaddr}
             list.concat(taicpu.op_reg_reg_const(A_ADDIS,NR_R11,NR_R11,
               smallint((href.offset shr 16)+ord(smallint(href.offset and $ffff) < 0))));
             href.offset := smallint(href.offset and $ffff);