From 038e5067b9f0398c0022f8e99a8c582b16d37384 Mon Sep 17 00:00:00 2001 From: pierre Date: Thu, 28 Nov 2019 17:04:55 +0000 Subject: [PATCH] Merge r43598 ------------------------------------------------------------------------ r43598 | pierre | 2019-11-27 22:15:23 +0000 (Wed, 27 Nov 2019) | 1 line Use defined(aarch64) instead of defined(cpuaarch64) for FPC_HAS_INTERNAL_ABS_INT64 ------------------------------------------------------------------------ --- Merging r43598 into '.': U compiler/options.pas --- Recording mergeinfo for merge of r43598 into '.': U . git-svn-id: branches/fixes_3_2@43606 - --- compiler/options.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/options.pas b/compiler/options.pas index a54e1e17af..57fefd6fbf 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -3598,7 +3598,7 @@ procedure read_arguments(cmd:TCmdStr); {$endif i8086 or avr} { abs(long) is handled internally on all CPUs } def_system_macro('FPC_HAS_INTERNAL_ABS_LONG'); - {$if defined(i8086) or defined(i386) or defined(x86_64) or defined(powerpc64) or defined(cpuaarch64)} + {$if defined(i8086) or defined(i386) or defined(x86_64) or defined(powerpc64) or defined(aarch64)} def_system_macro('FPC_HAS_INTERNAL_ABS_INT64'); {$endif i8086 or i386 or x86_64 or powerpc64 or aarch64}