diff options
Diffstat (limited to 'packages/univint/src/OSAComp.pas')
| -rw-r--r-- | packages/univint/src/OSAComp.pas | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/packages/univint/src/OSAComp.pas b/packages/univint/src/OSAComp.pas index 4bd6fd52ed..241241cc12 100644 --- a/packages/univint/src/OSAComp.pas +++ b/packages/univint/src/OSAComp.pas @@ -10,7 +10,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } @@ -70,6 +70,11 @@ interface {$elsec} {$setc __arm__ := 0} {$endc} +{$ifc not defined __arm64__ and defined CPUAARCH64} + {$setc __arm64__ := 1} +{$elsec} + {$setc __arm64__ := 0} +{$endc} {$ifc defined cpu64} {$setc __LP64__ := 1} @@ -88,6 +93,7 @@ interface {$setc TARGET_CPU_X86 := FALSE} {$setc TARGET_CPU_X86_64 := FALSE} {$setc TARGET_CPU_ARM := FALSE} + {$setc TARGET_CPU_ARM64 := FALSE} {$setc TARGET_OS_MAC := TRUE} {$setc TARGET_OS_IPHONE := FALSE} {$setc TARGET_IPHONE_SIMULATOR := FALSE} @@ -98,6 +104,7 @@ interface {$setc TARGET_CPU_X86 := FALSE} {$setc TARGET_CPU_X86_64 := FALSE} {$setc TARGET_CPU_ARM := FALSE} + {$setc TARGET_CPU_ARM64 := FALSE} {$setc TARGET_OS_MAC := TRUE} {$setc TARGET_OS_IPHONE := FALSE} {$setc TARGET_IPHONE_SIMULATOR := FALSE} @@ -108,6 +115,7 @@ interface {$setc TARGET_CPU_X86 := TRUE} {$setc TARGET_CPU_X86_64 := FALSE} {$setc TARGET_CPU_ARM := FALSE} + {$setc TARGET_CPU_ARM64 := FALSE} {$ifc defined(iphonesim)} {$setc TARGET_OS_MAC := FALSE} {$setc TARGET_OS_IPHONE := TRUE} @@ -124,6 +132,7 @@ interface {$setc TARGET_CPU_X86 := FALSE} {$setc TARGET_CPU_X86_64 := TRUE} {$setc TARGET_CPU_ARM := FALSE} + {$setc TARGET_CPU_ARM64 := FALSE} {$setc TARGET_OS_MAC := TRUE} {$setc TARGET_OS_IPHONE := FALSE} {$setc TARGET_IPHONE_SIMULATOR := FALSE} @@ -134,13 +143,26 @@ interface {$setc TARGET_CPU_X86 := FALSE} {$setc TARGET_CPU_X86_64 := FALSE} {$setc TARGET_CPU_ARM := TRUE} + {$setc TARGET_CPU_ARM64 := FALSE} + { will require compiler define when/if other Apple devices with ARM cpus ship } + {$setc TARGET_OS_MAC := FALSE} + {$setc TARGET_OS_IPHONE := TRUE} + {$setc TARGET_IPHONE_SIMULATOR := FALSE} + {$setc TARGET_OS_EMBEDDED := TRUE} +{$elifc defined __arm64__ and __arm64__} + {$setc TARGET_CPU_PPC := FALSE} + {$setc TARGET_CPU_PPC64 := FALSE} + {$setc TARGET_CPU_X86 := FALSE} + {$setc TARGET_CPU_X86_64 := FALSE} + {$setc TARGET_CPU_ARM := FALSE} + {$setc TARGET_CPU_ARM64 := TRUE} { will require compiler define when/if other Apple devices with ARM cpus ship } {$setc TARGET_OS_MAC := FALSE} {$setc TARGET_OS_IPHONE := TRUE} {$setc TARGET_IPHONE_SIMULATOR := FALSE} {$setc TARGET_OS_EMBEDDED := TRUE} {$elsec} - {$error __ppc__ nor __ppc64__ nor __i386__ nor __x86_64__ nor __arm__ is defined.} + {$error __ppc__ nor __ppc64__ nor __i386__ nor __x86_64__ nor __arm__ nor __arm64__ is defined.} {$endc} {$ifc defined __LP64__ and __LP64__ } |