diff --git a/compiler/jvm/njvmadd.pas b/compiler/jvm/njvmadd.pas index 375e0a8913..32a3d8055a 100644 --- a/compiler/jvm/njvmadd.pas +++ b/compiler/jvm/njvmadd.pas @@ -48,6 +48,7 @@ interface procedure second_cmpboolean;override; procedure second_cmpsmallset;override; procedure second_cmp64bit;override; + procedure second_add64bit; override; procedure second_cmpordinal;override; end; @@ -348,6 +349,12 @@ interface end; + procedure tjvmaddnode.second_add64bit; + begin + second_opordinal; + end; + + procedure tjvmaddnode.second_cmpordinal; begin second_generic_compare; diff --git a/compiler/nadd.pas b/compiler/nadd.pas index afcce13a34..9b4b1db124 100644 --- a/compiler/nadd.pas +++ b/compiler/nadd.pas @@ -2597,7 +2597,7 @@ implementation internalerror(200103291); expectloc:=LOC_FLAGS; end -{$ifndef cpu64bitaddr} +{$ifndef cpu64bitalu} { is there a 64 bit type ? } else if (torddef(ld).ordtype in [s64bit,u64bit,scurrency]) then begin @@ -2609,7 +2609,7 @@ implementation else expectloc:=LOC_JUMP; end -{$endif cpu64bitaddr} +{$endif cpu64bitalu} {$ifndef cpuneedsmulhelper} { is there a cardinal? } else if (torddef(ld).ordtype=u32bit) then