diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-02-23 22:53:34 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-02-23 22:53:34 +0000 |
| commit | c201ba6bc2eccb124235789286b2d96b266b2f5c (patch) | |
| tree | ff4d7ae2affe52fbfaf90394f3586a99b15bc6d9 | |
| parent | 13e0c3151ff17a26c5b34396e3f43586d0086e63 (diff) | |
| download | fpc-c201ba6bc2eccb124235789286b2d96b266b2f5c.tar.gz | |
* regenerated with AArch64 support
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@29931 3ad0048d-3df7-0310-abae-a5850022a9f2
456 files changed, 10704 insertions, 672 deletions
diff --git a/packages/univint/src/ABActions.pas b/packages/univint/src/ABActions.pas index 50e57d43f9..5bed529dcf 100644 --- a/packages/univint/src/ABActions.pas +++ b/packages/univint/src/ABActions.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ABAddressBook.pas b/packages/univint/src/ABAddressBook.pas index 9b51582492..8c8ec010ed 100644 --- a/packages/univint/src/ABAddressBook.pas +++ b/packages/univint/src/ABAddressBook.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ABGlobals.pas b/packages/univint/src/ABGlobals.pas index e8bee36003..0183b1f542 100644 --- a/packages/univint/src/ABGlobals.pas +++ b/packages/univint/src/ABGlobals.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ABPeoplePicker.pas b/packages/univint/src/ABPeoplePicker.pas index 676be2ed35..a376f318b9 100644 --- a/packages/univint/src/ABPeoplePicker.pas +++ b/packages/univint/src/ABPeoplePicker.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ABTypedefs.pas b/packages/univint/src/ABTypedefs.pas index 69ef7a7009..26ac5a6c66 100644 --- a/packages/univint/src/ABTypedefs.pas +++ b/packages/univint/src/ABTypedefs.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/AEDataModel.pas b/packages/univint/src/AEDataModel.pas index 84d160e6a1..f2b0297e98 100644 --- a/packages/univint/src/AEDataModel.pas +++ b/packages/univint/src/AEDataModel.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AEHelpers.pas b/packages/univint/src/AEHelpers.pas index 5588cc7d8a..2af6b9dbbb 100644 --- a/packages/univint/src/AEHelpers.pas +++ b/packages/univint/src/AEHelpers.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AEInteraction.pas b/packages/univint/src/AEInteraction.pas index 6390d7b78e..7d16950ffa 100644 --- a/packages/univint/src/AEInteraction.pas +++ b/packages/univint/src/AEInteraction.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/AEMach.pas b/packages/univint/src/AEMach.pas index e9101bda0a..61538bbb9e 100644 --- a/packages/univint/src/AEMach.pas +++ b/packages/univint/src/AEMach.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AEObjects.pas b/packages/univint/src/AEObjects.pas index 50d7d0b003..3a0f39506b 100644 --- a/packages/univint/src/AEObjects.pas +++ b/packages/univint/src/AEObjects.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AEPackObject.pas b/packages/univint/src/AEPackObject.pas index a5d4e41f33..05ab955923 100644 --- a/packages/univint/src/AEPackObject.pas +++ b/packages/univint/src/AEPackObject.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AERegistry.pas b/packages/univint/src/AERegistry.pas index e5da72c406..0774bd7ef3 100644 --- a/packages/univint/src/AERegistry.pas +++ b/packages/univint/src/AERegistry.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AEUserTermTypes.pas b/packages/univint/src/AEUserTermTypes.pas index 1fd095898e..036d0ff9ae 100644 --- a/packages/univint/src/AEUserTermTypes.pas +++ b/packages/univint/src/AEUserTermTypes.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AIFF.pas b/packages/univint/src/AIFF.pas index 02841d8915..8ae09b4cc8 100644 --- a/packages/univint/src/AIFF.pas +++ b/packages/univint/src/AIFF.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/ASDebugging.pas b/packages/univint/src/ASDebugging.pas index e4bb4c0670..24052a4527 100644 --- a/packages/univint/src/ASDebugging.pas +++ b/packages/univint/src/ASDebugging.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__ } diff --git a/packages/univint/src/ASRegistry.pas b/packages/univint/src/ASRegistry.pas index 787ec238af..bad43cc0fc 100644 --- a/packages/univint/src/ASRegistry.pas +++ b/packages/univint/src/ASRegistry.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__ } diff --git a/packages/univint/src/ATSFont.pas b/packages/univint/src/ATSFont.pas index 5ff16942c2..516e1b69de 100644 --- a/packages/univint/src/ATSFont.pas +++ b/packages/univint/src/ATSFont.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__ } diff --git a/packages/univint/src/ATSLayoutTypes.pas b/packages/univint/src/ATSLayoutTypes.pas index 102c7cafd3..165c7e6f58 100644 --- a/packages/univint/src/ATSLayoutTypes.pas +++ b/packages/univint/src/ATSLayoutTypes.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 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/ATSTypes.pas b/packages/univint/src/ATSTypes.pas index 192390e9b5..7f8d572b9f 100644 --- a/packages/univint/src/ATSTypes.pas +++ b/packages/univint/src/ATSTypes.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 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/ATSUnicodeDirectAccess.pas b/packages/univint/src/ATSUnicodeDirectAccess.pas index 355e29fb58..df7c8337f9 100644 --- a/packages/univint/src/ATSUnicodeDirectAccess.pas +++ b/packages/univint/src/ATSUnicodeDirectAccess.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeDrawing.pas b/packages/univint/src/ATSUnicodeDrawing.pas index 58e10f1e2b..6c8b308668 100644 --- a/packages/univint/src/ATSUnicodeDrawing.pas +++ b/packages/univint/src/ATSUnicodeDrawing.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeFlattening.pas b/packages/univint/src/ATSUnicodeFlattening.pas index 8a3fe6f903..997e8705bc 100644 --- a/packages/univint/src/ATSUnicodeFlattening.pas +++ b/packages/univint/src/ATSUnicodeFlattening.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeFonts.pas b/packages/univint/src/ATSUnicodeFonts.pas index 96b9fdc552..67c4e0c85b 100644 --- a/packages/univint/src/ATSUnicodeFonts.pas +++ b/packages/univint/src/ATSUnicodeFonts.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeGlyphs.pas b/packages/univint/src/ATSUnicodeGlyphs.pas index 87deb8959d..7cc861b2d8 100644 --- a/packages/univint/src/ATSUnicodeGlyphs.pas +++ b/packages/univint/src/ATSUnicodeGlyphs.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeObjects.pas b/packages/univint/src/ATSUnicodeObjects.pas index 4c26539f24..c3190febc8 100644 --- a/packages/univint/src/ATSUnicodeObjects.pas +++ b/packages/univint/src/ATSUnicodeObjects.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/ATSUnicodeTypes.pas b/packages/univint/src/ATSUnicodeTypes.pas index 31874ebfe2..bc39987dd9 100644 --- a/packages/univint/src/ATSUnicodeTypes.pas +++ b/packages/univint/src/ATSUnicodeTypes.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -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__ } diff --git a/packages/univint/src/AUComponent.pas b/packages/univint/src/AUComponent.pas index 2616d6277b..60194bf8b1 100644 --- a/packages/univint/src/AUComponent.pas +++ b/packages/univint/src/AUComponent.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Pascal Translation Update: Jonas Maebe <jonas@freepascal.org>, October 2012 } @@ -66,6 +66,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} @@ -84,6 +89,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} @@ -94,6 +100,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} @@ -104,6 +111,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} @@ -120,6 +128,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} @@ -130,13 +139,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__ } diff --git a/packages/univint/src/AVLTree.pas b/packages/univint/src/AVLTree.pas index 16ff85fb8c..70deae4931 100644 --- a/packages/univint/src/AVLTree.pas +++ b/packages/univint/src/AVLTree.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/AXActionConstants.pas b/packages/univint/src/AXActionConstants.pas index 23f5360ccd..7237527c13 100644 --- a/packages/univint/src/AXActionConstants.pas +++ b/packages/univint/src/AXActionConstants.pas @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/AXAttributeConstants.pas b/packages/univint/src/AXAttributeConstants.pas index 123f2e9590..c98c74b33d 100644 --- a/packages/univint/src/AXAttributeConstants.pas +++ b/packages/univint/src/AXAttributeConstants.pas @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/AXConstants.pas b/packages/univint/src/AXConstants.pas index f0b835a2ea..b5a0a818ed 100644 --- a/packages/univint/src/AXConstants.pas +++ b/packages/univint/src/AXConstants.pas @@ -54,6 +54,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} @@ -72,6 +77,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} @@ -82,6 +88,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} @@ -92,6 +99,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} @@ -108,6 +116,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} @@ -118,13 +127,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__ } diff --git a/packages/univint/src/AXErrors.pas b/packages/univint/src/AXErrors.pas index 187a98ead4..9aaf15814d 100644 --- a/packages/univint/src/AXErrors.pas +++ b/packages/univint/src/AXErrors.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/AXNotificationConstants.pas b/packages/univint/src/AXNotificationConstants.pas index b8c96136fb..4575deaa07 100644 --- a/packages/univint/src/AXNotificationConstants.pas +++ b/packages/univint/src/AXNotificationConstants.pas @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/AXRoleConstants.pas b/packages/univint/src/AXRoleConstants.pas index 4b850f9d4a..12dec60195 100644 --- a/packages/univint/src/AXRoleConstants.pas +++ b/packages/univint/src/AXRoleConstants.pas @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/AXTextAttributedString.pas b/packages/univint/src/AXTextAttributedString.pas index a5bba1a86b..489de0e033 100644 --- a/packages/univint/src/AXTextAttributedString.pas +++ b/packages/univint/src/AXTextAttributedString.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/AXUIElement.pas b/packages/univint/src/AXUIElement.pas index bad90e7703..2148688128 100644 --- a/packages/univint/src/AXUIElement.pas +++ b/packages/univint/src/AXUIElement.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/AXValue.pas b/packages/univint/src/AXValue.pas index 767111ffa0..e5fe848853 100644 --- a/packages/univint/src/AXValue.pas +++ b/packages/univint/src/AXValue.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/AXValueConstants.pas b/packages/univint/src/AXValueConstants.pas index 18919865ed..4af1869e8e 100644 --- a/packages/univint/src/AXValueConstants.pas +++ b/packages/univint/src/AXValueConstants.pas @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/Accessibility.pas b/packages/univint/src/Accessibility.pas index c564867a5b..c61e456239 100644 --- a/packages/univint/src/Accessibility.pas +++ b/packages/univint/src/Accessibility.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/Aliases.pas b/packages/univint/src/Aliases.pas index 0a35577630..f75c1244d1 100644 --- a/packages/univint/src/Aliases.pas +++ b/packages/univint/src/Aliases.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Appearance.pas b/packages/univint/src/Appearance.pas index d85aa69807..4d4fa4044a 100644 --- a/packages/univint/src/Appearance.pas +++ b/packages/univint/src/Appearance.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/AppleDiskPartitions.pas b/packages/univint/src/AppleDiskPartitions.pas index 778be73e15..31b6b49355 100644 --- a/packages/univint/src/AppleDiskPartitions.pas +++ b/packages/univint/src/AppleDiskPartitions.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 } { Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 (only changes in C header were layout, so not updated since deprecated) } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AppleEvents.pas b/packages/univint/src/AppleEvents.pas index 95cfe5d953..9752f6a21c 100644 --- a/packages/univint/src/AppleEvents.pas +++ b/packages/univint/src/AppleEvents.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/AppleHelp.pas b/packages/univint/src/AppleHelp.pas index 09d5fb1f57..393f08f28d 100644 --- a/packages/univint/src/AppleHelp.pas +++ b/packages/univint/src/AppleHelp.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 } { Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AppleScript.pas b/packages/univint/src/AppleScript.pas index a8c7c55c88..cebef587c2 100644 --- a/packages/univint/src/AppleScript.pas +++ b/packages/univint/src/AppleScript.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__ } diff --git a/packages/univint/src/AudioCodecs.pas b/packages/univint/src/AudioCodecs.pas index 5eb8032ec7..cf9544e834 100644 --- a/packages/univint/src/AudioCodecs.pas +++ b/packages/univint/src/AudioCodecs.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AudioComponents.pas b/packages/univint/src/AudioComponents.pas index f275d0ceae..e9fd4092f5 100644 --- a/packages/univint/src/AudioComponents.pas +++ b/packages/univint/src/AudioComponents.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Pascal Translation Update: Jonas Maebe <jonas@freepascal.org>, October 2012 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/AudioHardware.pas b/packages/univint/src/AudioHardware.pas index 468c1c9fc8..ee2b1047ee 100644 --- a/packages/univint/src/AudioHardware.pas +++ b/packages/univint/src/AudioHardware.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AudioHardwareBase.pas b/packages/univint/src/AudioHardwareBase.pas index e735bbba4b..67afa26ed0 100644 --- a/packages/univint/src/AudioHardwareBase.pas +++ b/packages/univint/src/AudioHardwareBase.pas @@ -6,7 +6,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2012 } @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/AudioHardwareDeprecated.pas b/packages/univint/src/AudioHardwareDeprecated.pas index 6a8f71eac5..1018f133ab 100644 --- a/packages/univint/src/AudioHardwareDeprecated.pas +++ b/packages/univint/src/AudioHardwareDeprecated.pas @@ -6,7 +6,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2012 } @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/AudioOutputUnit.pas b/packages/univint/src/AudioOutputUnit.pas index 6973216edb..6eb0727493 100644 --- a/packages/univint/src/AudioOutputUnit.pas +++ b/packages/univint/src/AudioOutputUnit.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AudioUnitCarbonViews.pas b/packages/univint/src/AudioUnitCarbonViews.pas index b144d2465f..c7b6403ccd 100644 --- a/packages/univint/src/AudioUnitCarbonViews.pas +++ b/packages/univint/src/AudioUnitCarbonViews.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/AudioUnitParameters.pas b/packages/univint/src/AudioUnitParameters.pas index 035e3494de..7fdec9a992 100644 --- a/packages/univint/src/AudioUnitParameters.pas +++ b/packages/univint/src/AudioUnitParameters.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AudioUnitProperties.pas b/packages/univint/src/AudioUnitProperties.pas index 75347080e2..2d06f5658e 100644 --- a/packages/univint/src/AudioUnitProperties.pas +++ b/packages/univint/src/AudioUnitProperties.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/AuthSession.pas b/packages/univint/src/AuthSession.pas index 7f7711baf1..af91a178e9 100644 --- a/packages/univint/src/AuthSession.pas +++ b/packages/univint/src/AuthSession.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/Authorization.pas b/packages/univint/src/Authorization.pas index f58d3ebbbb..94125d41ba 100644 --- a/packages/univint/src/Authorization.pas +++ b/packages/univint/src/Authorization.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/AuthorizationDB.pas b/packages/univint/src/AuthorizationDB.pas index c1fea4f597..b01e62f405 100644 --- a/packages/univint/src/AuthorizationDB.pas +++ b/packages/univint/src/AuthorizationDB.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/AuthorizationPlugin.pas b/packages/univint/src/AuthorizationPlugin.pas index 8cbf2b4805..bb7686cae8 100644 --- a/packages/univint/src/AuthorizationPlugin.pas +++ b/packages/univint/src/AuthorizationPlugin.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/AuthorizationTags.pas b/packages/univint/src/AuthorizationTags.pas index e268331112..24e38620f5 100644 --- a/packages/univint/src/AuthorizationTags.pas +++ b/packages/univint/src/AuthorizationTags.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/BackupCore.pas b/packages/univint/src/BackupCore.pas index 6eaa5079fd..0c536cb433 100644 --- a/packages/univint/src/BackupCore.pas +++ b/packages/univint/src/BackupCore.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/CFArray.pas b/packages/univint/src/CFArray.pas index b5cabc5626..90497541f4 100644 --- a/packages/univint/src/CFArray.pas +++ b/packages/univint/src/CFArray.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFAttributedString.pas b/packages/univint/src/CFAttributedString.pas index dcdb54e58b..33ec1f44ac 100644 --- a/packages/univint/src/CFAttributedString.pas +++ b/packages/univint/src/CFAttributedString.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFBag.pas b/packages/univint/src/CFBag.pas index 49737c4e79..a8d11603e7 100644 --- a/packages/univint/src/CFBag.pas +++ b/packages/univint/src/CFBag.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFBase.pas b/packages/univint/src/CFBase.pas index 42484e95a0..574bca69d8 100644 --- a/packages/univint/src/CFBase.pas +++ b/packages/univint/src/CFBase.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFBinaryHeap.pas b/packages/univint/src/CFBinaryHeap.pas index f9167cc686..fe39ed3e80 100644 --- a/packages/univint/src/CFBinaryHeap.pas +++ b/packages/univint/src/CFBinaryHeap.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFBitVector.pas b/packages/univint/src/CFBitVector.pas index 0ce24ead5c..44d9783310 100644 --- a/packages/univint/src/CFBitVector.pas +++ b/packages/univint/src/CFBitVector.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFBundle.pas b/packages/univint/src/CFBundle.pas index a2812ca101..246fe2fc83 100644 --- a/packages/univint/src/CFBundle.pas +++ b/packages/univint/src/CFBundle.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFByteOrders.pas b/packages/univint/src/CFByteOrders.pas index 2738b0fcbf..4c7924a927 100644 --- a/packages/univint/src/CFByteOrders.pas +++ b/packages/univint/src/CFByteOrders.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFCalendar.pas b/packages/univint/src/CFCalendar.pas index f76cb7aa16..351031cfc1 100644 --- a/packages/univint/src/CFCalendar.pas +++ b/packages/univint/src/CFCalendar.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFCharacterSet.pas b/packages/univint/src/CFCharacterSet.pas index 8f669a67fa..396acdb5d7 100644 --- a/packages/univint/src/CFCharacterSet.pas +++ b/packages/univint/src/CFCharacterSet.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFData.pas b/packages/univint/src/CFData.pas index 19d39e5d28..67ae9d2067 100644 --- a/packages/univint/src/CFData.pas +++ b/packages/univint/src/CFData.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFDate.pas b/packages/univint/src/CFDate.pas index 593ecfe3cb..f73a09888a 100644 --- a/packages/univint/src/CFDate.pas +++ b/packages/univint/src/CFDate.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFDateFormatter.pas b/packages/univint/src/CFDateFormatter.pas index 72973a2282..e41b276a07 100644 --- a/packages/univint/src/CFDateFormatter.pas +++ b/packages/univint/src/CFDateFormatter.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFDictionary.pas b/packages/univint/src/CFDictionary.pas index 3d6ed9dbcf..9976f9c4d0 100644 --- a/packages/univint/src/CFDictionary.pas +++ b/packages/univint/src/CFDictionary.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFError.pas b/packages/univint/src/CFError.pas index b7b6ad49ae..470b3b0fd2 100644 --- a/packages/univint/src/CFError.pas +++ b/packages/univint/src/CFError.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFFTPStream.pas b/packages/univint/src/CFFTPStream.pas index d611995d26..bf0708d12f 100644 --- a/packages/univint/src/CFFTPStream.pas +++ b/packages/univint/src/CFFTPStream.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFHTTPAuthentication.pas b/packages/univint/src/CFHTTPAuthentication.pas index 77d6e0c33f..4b37ab10be 100644 --- a/packages/univint/src/CFHTTPAuthentication.pas +++ b/packages/univint/src/CFHTTPAuthentication.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2008 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFHTTPMessage.pas b/packages/univint/src/CFHTTPMessage.pas index d87b3e8a75..79e4354558 100644 --- a/packages/univint/src/CFHTTPMessage.pas +++ b/packages/univint/src/CFHTTPMessage.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/CFHTTPStream.pas b/packages/univint/src/CFHTTPStream.pas index 3d06e099ac..78b03be8f0 100644 --- a/packages/univint/src/CFHTTPStream.pas +++ b/packages/univint/src/CFHTTPStream.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/CFHost.pas b/packages/univint/src/CFHost.pas index 0f19828cc5..02a1018ab1 100644 --- a/packages/univint/src/CFHost.pas +++ b/packages/univint/src/CFHost.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFLocale.pas b/packages/univint/src/CFLocale.pas index f7e25f86b6..ddb5f07226 100644 --- a/packages/univint/src/CFLocale.pas +++ b/packages/univint/src/CFLocale.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFMachPort.pas b/packages/univint/src/CFMachPort.pas index 32434424c6..763ea506ab 100644 --- a/packages/univint/src/CFMachPort.pas +++ b/packages/univint/src/CFMachPort.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFMessagePort.pas b/packages/univint/src/CFMessagePort.pas index 282ec19212..3d5130a1b8 100644 --- a/packages/univint/src/CFMessagePort.pas +++ b/packages/univint/src/CFMessagePort.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFNetDiagnostics.pas b/packages/univint/src/CFNetDiagnostics.pas index e7fa8aa73e..15eecad748 100644 --- a/packages/univint/src/CFNetDiagnostics.pas +++ b/packages/univint/src/CFNetDiagnostics.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2008 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFNetServices.pas b/packages/univint/src/CFNetServices.pas index f1e573c4f2..7acdf501f8 100644 --- a/packages/univint/src/CFNetServices.pas +++ b/packages/univint/src/CFNetServices.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/CFNetworkErrorss.pas b/packages/univint/src/CFNetworkErrorss.pas index b4eec78791..83050d8a27 100644 --- a/packages/univint/src/CFNetworkErrorss.pas +++ b/packages/univint/src/CFNetworkErrorss.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2008 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFNotificationCenter.pas b/packages/univint/src/CFNotificationCenter.pas index 7c79651f3d..d5a1530b16 100644 --- a/packages/univint/src/CFNotificationCenter.pas +++ b/packages/univint/src/CFNotificationCenter.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFNumber.pas b/packages/univint/src/CFNumber.pas index 45b20342c8..dd19129433 100644 --- a/packages/univint/src/CFNumber.pas +++ b/packages/univint/src/CFNumber.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFNumberFormatter.pas b/packages/univint/src/CFNumberFormatter.pas index ce1a259163..2b781b7265 100644 --- a/packages/univint/src/CFNumberFormatter.pas +++ b/packages/univint/src/CFNumberFormatter.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFPlugIn.pas b/packages/univint/src/CFPlugIn.pas index 2626198e2a..142857e152 100644 --- a/packages/univint/src/CFPlugIn.pas +++ b/packages/univint/src/CFPlugIn.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFPlugInCOM.pas b/packages/univint/src/CFPlugInCOM.pas index 260fec7d3a..960e0d0034 100644 --- a/packages/univint/src/CFPlugInCOM.pas +++ b/packages/univint/src/CFPlugInCOM.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFPreferences.pas b/packages/univint/src/CFPreferences.pas index 036ff30722..202ced42e0 100644 --- a/packages/univint/src/CFPreferences.pas +++ b/packages/univint/src/CFPreferences.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFPropertyList.pas b/packages/univint/src/CFPropertyList.pas index 0036a8b7a9..d265e536d7 100644 --- a/packages/univint/src/CFPropertyList.pas +++ b/packages/univint/src/CFPropertyList.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFProxySupport.pas b/packages/univint/src/CFProxySupport.pas index 87fc2dda76..2e2156895b 100644 --- a/packages/univint/src/CFProxySupport.pas +++ b/packages/univint/src/CFProxySupport.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2008 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CFRunLoop.pas b/packages/univint/src/CFRunLoop.pas index 3c00bcd602..81239cc2ca 100644 --- a/packages/univint/src/CFRunLoop.pas +++ b/packages/univint/src/CFRunLoop.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFSet.pas b/packages/univint/src/CFSet.pas index 97f8c11a7f..a5bb22aa3e 100644 --- a/packages/univint/src/CFSet.pas +++ b/packages/univint/src/CFSet.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFSocket.pas b/packages/univint/src/CFSocket.pas index 124aff0b11..432383ad41 100644 --- a/packages/univint/src/CFSocket.pas +++ b/packages/univint/src/CFSocket.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFSocketStream.pas b/packages/univint/src/CFSocketStream.pas index 8af1af71dc..923114d9b2 100644 --- a/packages/univint/src/CFSocketStream.pas +++ b/packages/univint/src/CFSocketStream.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/CFStream.pas b/packages/univint/src/CFStream.pas index 11736f82e7..cd8a2e70a9 100644 --- a/packages/univint/src/CFStream.pas +++ b/packages/univint/src/CFStream.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CFString.pas b/packages/univint/src/CFString.pas index dc5f4d7580..0b6c55549a 100644 --- a/packages/univint/src/CFString.pas +++ b/packages/univint/src/CFString.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFStringEncodingExt.pas b/packages/univint/src/CFStringEncodingExt.pas index 186559a2ab..7065877fde 100644 --- a/packages/univint/src/CFStringEncodingExt.pas +++ b/packages/univint/src/CFStringEncodingExt.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFStringTokenizer.pas b/packages/univint/src/CFStringTokenizer.pas index 1887b78de0..2884dc85b3 100644 --- a/packages/univint/src/CFStringTokenizer.pas +++ b/packages/univint/src/CFStringTokenizer.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CFTimeZone.pas b/packages/univint/src/CFTimeZone.pas index b38099cdba..5f782a0870 100644 --- a/packages/univint/src/CFTimeZone.pas +++ b/packages/univint/src/CFTimeZone.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFTree.pas b/packages/univint/src/CFTree.pas index 9a90f7de82..0fe388cbac 100644 --- a/packages/univint/src/CFTree.pas +++ b/packages/univint/src/CFTree.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFURL.pas b/packages/univint/src/CFURL.pas index 62024053f1..931f70fe01 100644 --- a/packages/univint/src/CFURL.pas +++ b/packages/univint/src/CFURL.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFURLAccess.pas b/packages/univint/src/CFURLAccess.pas index af7db45412..c45ddf917f 100644 --- a/packages/univint/src/CFURLAccess.pas +++ b/packages/univint/src/CFURLAccess.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFUUID.pas b/packages/univint/src/CFUUID.pas index 41903475db..54e480a761 100644 --- a/packages/univint/src/CFUUID.pas +++ b/packages/univint/src/CFUUID.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CFUserNotification.pas b/packages/univint/src/CFUserNotification.pas index 77fd624bf5..831c7d916c 100644 --- a/packages/univint/src/CFUserNotification.pas +++ b/packages/univint/src/CFUserNotification.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CFXMLNode.pas b/packages/univint/src/CFXMLNode.pas index 6fc2d6b495..7db120b0fa 100644 --- a/packages/univint/src/CFXMLNode.pas +++ b/packages/univint/src/CFXMLNode.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CFXMLParser.pas b/packages/univint/src/CFXMLParser.pas index ab2f1c54ce..ef1d979aba 100644 --- a/packages/univint/src/CFXMLParser.pas +++ b/packages/univint/src/CFXMLParser.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGAffineTransforms.pas b/packages/univint/src/CGAffineTransforms.pas index 3d867008c3..d7180d525c 100644 --- a/packages/univint/src/CGAffineTransforms.pas +++ b/packages/univint/src/CGAffineTransforms.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CGBase.pas b/packages/univint/src/CGBase.pas index af2cfda507..07e458a34c 100644 --- a/packages/univint/src/CGBase.pas +++ b/packages/univint/src/CGBase.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGBitmapContext.pas b/packages/univint/src/CGBitmapContext.pas index eb5e77e9ea..0eacc49581 100644 --- a/packages/univint/src/CGBitmapContext.pas +++ b/packages/univint/src/CGBitmapContext.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGColor.pas b/packages/univint/src/CGColor.pas index 048ff3c9a7..6ddd909eea 100644 --- a/packages/univint/src/CGColor.pas +++ b/packages/univint/src/CGColor.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGColorSpace.pas b/packages/univint/src/CGColorSpace.pas index 295256258e..3f957fa843 100644 --- a/packages/univint/src/CGColorSpace.pas +++ b/packages/univint/src/CGColorSpace.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CGContext.pas b/packages/univint/src/CGContext.pas index 38341236b2..fe8dbca975 100644 --- a/packages/univint/src/CGContext.pas +++ b/packages/univint/src/CGContext.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGDataConsumer.pas b/packages/univint/src/CGDataConsumer.pas index 46b8f86315..417bdbbdb5 100644 --- a/packages/univint/src/CGDataConsumer.pas +++ b/packages/univint/src/CGDataConsumer.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CGDataProvider.pas b/packages/univint/src/CGDataProvider.pas index 9f44904e73..141a8ac36b 100644 --- a/packages/univint/src/CGDataProvider.pas +++ b/packages/univint/src/CGDataProvider.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGDirectDisplay.pas b/packages/univint/src/CGDirectDisplay.pas index 9772dbcc08..c42c7d2f92 100644 --- a/packages/univint/src/CGDirectDisplay.pas +++ b/packages/univint/src/CGDirectDisplay.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGDirectPalette.pas b/packages/univint/src/CGDirectPalette.pas index fcc9e09759..aede1cc227 100644 --- a/packages/univint/src/CGDirectPalette.pas +++ b/packages/univint/src/CGDirectPalette.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGDisplayConfiguration.pas b/packages/univint/src/CGDisplayConfiguration.pas index b3824cfb3c..44779eed99 100644 --- a/packages/univint/src/CGDisplayConfiguration.pas +++ b/packages/univint/src/CGDisplayConfiguration.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGDisplayFades.pas b/packages/univint/src/CGDisplayFades.pas index 038ca07ada..ba75ce9381 100644 --- a/packages/univint/src/CGDisplayFades.pas +++ b/packages/univint/src/CGDisplayFades.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGErrors.pas b/packages/univint/src/CGErrors.pas index 58349dbd32..d01f087627 100644 --- a/packages/univint/src/CGErrors.pas +++ b/packages/univint/src/CGErrors.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGEvent.pas b/packages/univint/src/CGEvent.pas index 9fa888b766..d70eeaeceb 100644 --- a/packages/univint/src/CGEvent.pas +++ b/packages/univint/src/CGEvent.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGEventSource.pas b/packages/univint/src/CGEventSource.pas index 9da8bd3b7d..6ef4e7be2d 100644 --- a/packages/univint/src/CGEventSource.pas +++ b/packages/univint/src/CGEventSource.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGEventTypes.pas b/packages/univint/src/CGEventTypes.pas index 6437efa46f..dfd082a7ad 100644 --- a/packages/univint/src/CGEventTypes.pas +++ b/packages/univint/src/CGEventTypes.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGFont.pas b/packages/univint/src/CGFont.pas index 6dcb038b6c..18ceff9c42 100644 --- a/packages/univint/src/CGFont.pas +++ b/packages/univint/src/CGFont.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGFunction.pas b/packages/univint/src/CGFunction.pas index 20d5ddc583..168341ca59 100644 --- a/packages/univint/src/CGFunction.pas +++ b/packages/univint/src/CGFunction.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGGLContext.pas b/packages/univint/src/CGGLContext.pas index 853a109734..04f69eee6c 100644 --- a/packages/univint/src/CGGLContext.pas +++ b/packages/univint/src/CGGLContext.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGGeometry.pas b/packages/univint/src/CGGeometry.pas index f367769780..4f784ff4e0 100644 --- a/packages/univint/src/CGGeometry.pas +++ b/packages/univint/src/CGGeometry.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGGradient.pas b/packages/univint/src/CGGradient.pas index f9435c5a59..9ea3323ec1 100644 --- a/packages/univint/src/CGGradient.pas +++ b/packages/univint/src/CGGradient.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGImage.pas b/packages/univint/src/CGImage.pas index 36af6c3890..11ea528af1 100644 --- a/packages/univint/src/CGImage.pas +++ b/packages/univint/src/CGImage.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CGImageDestination.pas b/packages/univint/src/CGImageDestination.pas index 7eb89b5f67..9f5bea7822 100644 --- a/packages/univint/src/CGImageDestination.pas +++ b/packages/univint/src/CGImageDestination.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CGImageMetadata.pas b/packages/univint/src/CGImageMetadata.pas index df29451f33..a86c8397f7 100644 --- a/packages/univint/src/CGImageMetadata.pas +++ b/packages/univint/src/CGImageMetadata.pas @@ -53,6 +53,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} @@ -71,6 +76,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} @@ -81,6 +87,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} @@ -91,6 +98,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} @@ -107,6 +115,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} @@ -117,13 +126,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__ } diff --git a/packages/univint/src/CGImageProperties.pas b/packages/univint/src/CGImageProperties.pas index da699e4639..9ec137a12a 100644 --- a/packages/univint/src/CGImageProperties.pas +++ b/packages/univint/src/CGImageProperties.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CGImageSource.pas b/packages/univint/src/CGImageSource.pas index b9d0a5a97e..4b857658be 100644 --- a/packages/univint/src/CGImageSource.pas +++ b/packages/univint/src/CGImageSource.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CGLCurrent.pas b/packages/univint/src/CGLCurrent.pas index 1506836821..28cb643048 100644 --- a/packages/univint/src/CGLCurrent.pas +++ b/packages/univint/src/CGLCurrent.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGLDevice.pas b/packages/univint/src/CGLDevice.pas index d36a4d42f8..e1996df8fa 100644 --- a/packages/univint/src/CGLDevice.pas +++ b/packages/univint/src/CGLDevice.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGLProfiler.pas b/packages/univint/src/CGLProfiler.pas index fc5d20f90b..41048730e9 100644 --- a/packages/univint/src/CGLProfiler.pas +++ b/packages/univint/src/CGLProfiler.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGLProfilerFunctionEnums.pas b/packages/univint/src/CGLProfilerFunctionEnums.pas index 4dc1b47741..7741df277a 100644 --- a/packages/univint/src/CGLProfilerFunctionEnums.pas +++ b/packages/univint/src/CGLProfilerFunctionEnums.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGLRenderers.pas b/packages/univint/src/CGLRenderers.pas index 6b9c3e50c3..a1b6d70384 100644 --- a/packages/univint/src/CGLRenderers.pas +++ b/packages/univint/src/CGLRenderers.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGLTypes.pas b/packages/univint/src/CGLTypes.pas index f15b043fef..c3adcd7462 100644 --- a/packages/univint/src/CGLTypes.pas +++ b/packages/univint/src/CGLTypes.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/CGLayer.pas b/packages/univint/src/CGLayer.pas index 7ea89e3d39..04501bac9c 100644 --- a/packages/univint/src/CGLayer.pas +++ b/packages/univint/src/CGLayer.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFArray.pas b/packages/univint/src/CGPDFArray.pas index 16705e064a..49062c6b11 100644 --- a/packages/univint/src/CGPDFArray.pas +++ b/packages/univint/src/CGPDFArray.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFContentStream.pas b/packages/univint/src/CGPDFContentStream.pas index d99eeb74ed..b6261bc72b 100644 --- a/packages/univint/src/CGPDFContentStream.pas +++ b/packages/univint/src/CGPDFContentStream.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFContext.pas b/packages/univint/src/CGPDFContext.pas index aeea63bd8e..aaad3a9a6b 100644 --- a/packages/univint/src/CGPDFContext.pas +++ b/packages/univint/src/CGPDFContext.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFDictionary.pas b/packages/univint/src/CGPDFDictionary.pas index bd9d0ff836..b7615fa18b 100644 --- a/packages/univint/src/CGPDFDictionary.pas +++ b/packages/univint/src/CGPDFDictionary.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFDocument.pas b/packages/univint/src/CGPDFDocument.pas index f3c87d0f22..2cfbc2261a 100644 --- a/packages/univint/src/CGPDFDocument.pas +++ b/packages/univint/src/CGPDFDocument.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFObject.pas b/packages/univint/src/CGPDFObject.pas index 894ea9160c..fb480f4473 100644 --- a/packages/univint/src/CGPDFObject.pas +++ b/packages/univint/src/CGPDFObject.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFOperatorTable.pas b/packages/univint/src/CGPDFOperatorTable.pas index 90c01891aa..df40ca28f1 100644 --- a/packages/univint/src/CGPDFOperatorTable.pas +++ b/packages/univint/src/CGPDFOperatorTable.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFPage.pas b/packages/univint/src/CGPDFPage.pas index b120992213..3704d197d1 100644 --- a/packages/univint/src/CGPDFPage.pas +++ b/packages/univint/src/CGPDFPage.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFScanner.pas b/packages/univint/src/CGPDFScanner.pas index be335ae34e..41897fb2ff 100644 --- a/packages/univint/src/CGPDFScanner.pas +++ b/packages/univint/src/CGPDFScanner.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFStream.pas b/packages/univint/src/CGPDFStream.pas index 3d9d694cb3..91e0ed3524 100644 --- a/packages/univint/src/CGPDFStream.pas +++ b/packages/univint/src/CGPDFStream.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPDFString.pas b/packages/univint/src/CGPDFString.pas index 5b70560d72..39aa35694e 100644 --- a/packages/univint/src/CGPDFString.pas +++ b/packages/univint/src/CGPDFString.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPSConverter.pas b/packages/univint/src/CGPSConverter.pas index 8aed1f9725..94aafcd118 100644 --- a/packages/univint/src/CGPSConverter.pas +++ b/packages/univint/src/CGPSConverter.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPath.pas b/packages/univint/src/CGPath.pas index eda43b0e26..7eef6d7b5e 100644 --- a/packages/univint/src/CGPath.pas +++ b/packages/univint/src/CGPath.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGPattern.pas b/packages/univint/src/CGPattern.pas index 01f5195868..d0b5ccc8b0 100644 --- a/packages/univint/src/CGPattern.pas +++ b/packages/univint/src/CGPattern.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGRemoteOperation.pas b/packages/univint/src/CGRemoteOperation.pas index f60fd1e5e8..0d42c9789a 100644 --- a/packages/univint/src/CGRemoteOperation.pas +++ b/packages/univint/src/CGRemoteOperation.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGSession.pas b/packages/univint/src/CGSession.pas index e93b39e2a1..96e6bf8633 100644 --- a/packages/univint/src/CGSession.pas +++ b/packages/univint/src/CGSession.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGShading.pas b/packages/univint/src/CGShading.pas index 405542eb5e..995be784e6 100644 --- a/packages/univint/src/CGShading.pas +++ b/packages/univint/src/CGShading.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/CGWindow.pas b/packages/univint/src/CGWindow.pas index 62c116cf32..fc62771d1d 100644 --- a/packages/univint/src/CGWindow.pas +++ b/packages/univint/src/CGWindow.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CGWindowLevels.pas b/packages/univint/src/CGWindowLevels.pas index f8f71cfd24..f37410c8c1 100644 --- a/packages/univint/src/CGWindowLevels.pas +++ b/packages/univint/src/CGWindowLevels.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/CMCalibrator.pas b/packages/univint/src/CMCalibrator.pas index 1f678db313..0bc5f2dd67 100644 --- a/packages/univint/src/CMCalibrator.pas +++ b/packages/univint/src/CMCalibrator.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/CSIdentity.pas b/packages/univint/src/CSIdentity.pas index cb93f67301..f86acae34f 100644 --- a/packages/univint/src/CSIdentity.pas +++ b/packages/univint/src/CSIdentity.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/CSIdentityAuthority.pas b/packages/univint/src/CSIdentityAuthority.pas index 6cf5c4e953..6921266128 100644 --- a/packages/univint/src/CSIdentityAuthority.pas +++ b/packages/univint/src/CSIdentityAuthority.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/CSIdentityBase.pas b/packages/univint/src/CSIdentityBase.pas index 63c9532d16..4d686e4608 100644 --- a/packages/univint/src/CSIdentityBase.pas +++ b/packages/univint/src/CSIdentityBase.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { @@ -65,6 +65,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} @@ -83,6 +88,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} @@ -93,6 +99,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} @@ -103,6 +110,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} @@ -119,6 +127,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} @@ -129,13 +138,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__ } diff --git a/packages/univint/src/CSIdentityQuery.pas b/packages/univint/src/CSIdentityQuery.pas index d88a370eb5..2132200069 100644 --- a/packages/univint/src/CSIdentityQuery.pas +++ b/packages/univint/src/CSIdentityQuery.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/CTFont.pas b/packages/univint/src/CTFont.pas index c78ae6c77d..e3c889326a 100644 --- a/packages/univint/src/CTFont.pas +++ b/packages/univint/src/CTFont.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFontCollection.pas b/packages/univint/src/CTFontCollection.pas index e9507be77c..1c7ecab3e1 100644 --- a/packages/univint/src/CTFontCollection.pas +++ b/packages/univint/src/CTFontCollection.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFontDescriptor.pas b/packages/univint/src/CTFontDescriptor.pas index b9e97c1ed6..77cd1b388e 100644 --- a/packages/univint/src/CTFontDescriptor.pas +++ b/packages/univint/src/CTFontDescriptor.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFontManager.pas b/packages/univint/src/CTFontManager.pas index db532c5322..4d36e577e4 100644 --- a/packages/univint/src/CTFontManager.pas +++ b/packages/univint/src/CTFontManager.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFontManagerErrors.pas b/packages/univint/src/CTFontManagerErrors.pas index 02f272457e..52f1e6c8e2 100644 --- a/packages/univint/src/CTFontManagerErrors.pas +++ b/packages/univint/src/CTFontManagerErrors.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFontTraits.pas b/packages/univint/src/CTFontTraits.pas index a269562e13..e63ad096a4 100644 --- a/packages/univint/src/CTFontTraits.pas +++ b/packages/univint/src/CTFontTraits.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFrame.pas b/packages/univint/src/CTFrame.pas index f981c54f84..106445b1bf 100644 --- a/packages/univint/src/CTFrame.pas +++ b/packages/univint/src/CTFrame.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTFramesetter.pas b/packages/univint/src/CTFramesetter.pas index 57a7538e7e..0353c34811 100644 --- a/packages/univint/src/CTFramesetter.pas +++ b/packages/univint/src/CTFramesetter.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTGlyphInfo.pas b/packages/univint/src/CTGlyphInfo.pas index 4a442b3409..dae8b9f71c 100644 --- a/packages/univint/src/CTGlyphInfo.pas +++ b/packages/univint/src/CTGlyphInfo.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTLine.pas b/packages/univint/src/CTLine.pas index 60dfa13d95..4b37a0c5e3 100644 --- a/packages/univint/src/CTLine.pas +++ b/packages/univint/src/CTLine.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTParagraphStyle.pas b/packages/univint/src/CTParagraphStyle.pas index d0bc51a5a2..1d365a6f49 100644 --- a/packages/univint/src/CTParagraphStyle.pas +++ b/packages/univint/src/CTParagraphStyle.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTRun.pas b/packages/univint/src/CTRun.pas index 675fb9ddfe..140e82c337 100644 --- a/packages/univint/src/CTRun.pas +++ b/packages/univint/src/CTRun.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTStringAttributes.pas b/packages/univint/src/CTStringAttributes.pas index 8b8abb452d..6c475f8c65 100644 --- a/packages/univint/src/CTStringAttributes.pas +++ b/packages/univint/src/CTStringAttributes.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTTextTab.pas b/packages/univint/src/CTTextTab.pas index 55d86385fd..a1df394d1f 100644 --- a/packages/univint/src/CTTextTab.pas +++ b/packages/univint/src/CTTextTab.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CTTypesetter.pas b/packages/univint/src/CTTypesetter.pas index dd207338e2..8e60948999 100644 --- a/packages/univint/src/CTTypesetter.pas +++ b/packages/univint/src/CTTypesetter.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CVBase.pas b/packages/univint/src/CVBase.pas index 5fe2d1c3bf..58be1297bf 100644 --- a/packages/univint/src/CVBase.pas +++ b/packages/univint/src/CVBase.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/CVBuffer.pas b/packages/univint/src/CVBuffer.pas index 29bf35cbad..024a0c076c 100644 --- a/packages/univint/src/CVBuffer.pas +++ b/packages/univint/src/CVBuffer.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/CVDisplayLink.pas b/packages/univint/src/CVDisplayLink.pas index 90332e1f22..8a4e446104 100644 --- a/packages/univint/src/CVDisplayLink.pas +++ b/packages/univint/src/CVDisplayLink.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/CVHostTime.pas b/packages/univint/src/CVHostTime.pas index 7d637bd4e9..ae8e8e9091 100644 --- a/packages/univint/src/CVHostTime.pas +++ b/packages/univint/src/CVHostTime.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/CVImageBuffer.pas b/packages/univint/src/CVImageBuffer.pas index a87edb1c52..7800e0c924 100644 --- a/packages/univint/src/CVImageBuffer.pas +++ b/packages/univint/src/CVImageBuffer.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CVOpenGLBuffer.pas b/packages/univint/src/CVOpenGLBuffer.pas index a6c9f82c4e..adb9cf1ae3 100644 --- a/packages/univint/src/CVOpenGLBuffer.pas +++ b/packages/univint/src/CVOpenGLBuffer.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CVOpenGLBufferPool.pas b/packages/univint/src/CVOpenGLBufferPool.pas index 1a8f9bb475..51d330e9db 100644 --- a/packages/univint/src/CVOpenGLBufferPool.pas +++ b/packages/univint/src/CVOpenGLBufferPool.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CVOpenGLTexture.pas b/packages/univint/src/CVOpenGLTexture.pas index 8132b4c314..6f35b274a3 100644 --- a/packages/univint/src/CVOpenGLTexture.pas +++ b/packages/univint/src/CVOpenGLTexture.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CVOpenGLTextureCache.pas b/packages/univint/src/CVOpenGLTextureCache.pas index f7db52395d..5c9be02cea 100644 --- a/packages/univint/src/CVOpenGLTextureCache.pas +++ b/packages/univint/src/CVOpenGLTextureCache.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CVPixelBuffer.pas b/packages/univint/src/CVPixelBuffer.pas index faa990ed8e..7ccad4ca34 100644 --- a/packages/univint/src/CVPixelBuffer.pas +++ b/packages/univint/src/CVPixelBuffer.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CVPixelBufferIOSurface.pas b/packages/univint/src/CVPixelBufferIOSurface.pas index 460da1ce4e..de56bbb6af 100644 --- a/packages/univint/src/CVPixelBufferIOSurface.pas +++ b/packages/univint/src/CVPixelBufferIOSurface.pas @@ -60,6 +60,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} @@ -78,6 +83,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} @@ -88,6 +94,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 +105,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} @@ -114,6 +122,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} @@ -124,13 +133,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__ } diff --git a/packages/univint/src/CVPixelBufferPool.pas b/packages/univint/src/CVPixelBufferPool.pas index 0d8e2698c2..c52faed951 100644 --- a/packages/univint/src/CVPixelBufferPool.pas +++ b/packages/univint/src/CVPixelBufferPool.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/CVPixelFormatDescription.pas b/packages/univint/src/CVPixelFormatDescription.pas index 78cc65d05d..0fe9202119 100644 --- a/packages/univint/src/CVPixelFormatDescription.pas +++ b/packages/univint/src/CVPixelFormatDescription.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/CVReturns.pas b/packages/univint/src/CVReturns.pas index da103c9f47..5b25c0b470 100644 --- a/packages/univint/src/CVReturns.pas +++ b/packages/univint/src/CVReturns.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/CaptiveNetwork.pas b/packages/univint/src/CaptiveNetwork.pas index b35559f420..4ec378f99f 100644 --- a/packages/univint/src/CaptiveNetwork.pas +++ b/packages/univint/src/CaptiveNetwork.pas @@ -75,6 +75,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} @@ -93,6 +98,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} @@ -103,6 +109,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} @@ -113,6 +120,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} @@ -129,6 +137,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} @@ -139,13 +148,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__ } diff --git a/packages/univint/src/CarbonEvents.pas b/packages/univint/src/CarbonEvents.pas index 1e0136ac08..db3da3bf08 100644 --- a/packages/univint/src/CarbonEvents.pas +++ b/packages/univint/src/CarbonEvents.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/CarbonEventsCore.pas b/packages/univint/src/CarbonEventsCore.pas index d8359dfa15..45aa9cd278 100644 --- a/packages/univint/src/CarbonEventsCore.pas +++ b/packages/univint/src/CarbonEventsCore.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/CodeFragments.pas b/packages/univint/src/CodeFragments.pas index 63928b74a1..ea29a52f25 100644 --- a/packages/univint/src/CodeFragments.pas +++ b/packages/univint/src/CodeFragments.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/Collections.pas b/packages/univint/src/Collections.pas index 4c42e2e76a..74c843c8a0 100644 --- a/packages/univint/src/Collections.pas +++ b/packages/univint/src/Collections.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ColorPicker.pas b/packages/univint/src/ColorPicker.pas index bf0793202c..d1e96154d5 100644 --- a/packages/univint/src/ColorPicker.pas +++ b/packages/univint/src/ColorPicker.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/ColorSyncCMM.pas b/packages/univint/src/ColorSyncCMM.pas index bd5d3c225d..7608acb898 100644 --- a/packages/univint/src/ColorSyncCMM.pas +++ b/packages/univint/src/ColorSyncCMM.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/ColorSyncDeprecated.pas b/packages/univint/src/ColorSyncDeprecated.pas index e0a830602c..9994286371 100644 --- a/packages/univint/src/ColorSyncDeprecated.pas +++ b/packages/univint/src/ColorSyncDeprecated.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/ColorSyncDevice.pas b/packages/univint/src/ColorSyncDevice.pas index ca7146aa1f..4a0796f0f0 100644 --- a/packages/univint/src/ColorSyncDevice.pas +++ b/packages/univint/src/ColorSyncDevice.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/ColorSyncProfile.pas b/packages/univint/src/ColorSyncProfile.pas index 2c344ca9fa..c15bcc4b34 100644 --- a/packages/univint/src/ColorSyncProfile.pas +++ b/packages/univint/src/ColorSyncProfile.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/ColorSyncTransform.pas b/packages/univint/src/ColorSyncTransform.pas index 830a35a0e1..a1273a91d4 100644 --- a/packages/univint/src/ColorSyncTransform.pas +++ b/packages/univint/src/ColorSyncTransform.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/Components.pas b/packages/univint/src/Components.pas index eada8c9ffa..1d55e0b1d3 100644 --- a/packages/univint/src/Components.pas +++ b/packages/univint/src/Components.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/ConditionalMacros.pas b/packages/univint/src/ConditionalMacros.pas index fc8a177eed..7f49dd61dc 100644 --- a/packages/univint/src/ConditionalMacros.pas +++ b/packages/univint/src/ConditionalMacros.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/ControlDefinitions.pas b/packages/univint/src/ControlDefinitions.pas index 15ec29dca4..7403549c48 100644 --- a/packages/univint/src/ControlDefinitions.pas +++ b/packages/univint/src/ControlDefinitions.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/Controls.pas b/packages/univint/src/Controls.pas index 80b70541c9..4658acde9e 100644 --- a/packages/univint/src/Controls.pas +++ b/packages/univint/src/Controls.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/CoreAudioTypes.pas b/packages/univint/src/CoreAudioTypes.pas index 26f9639c26..8c886b85db 100644 --- a/packages/univint/src/CoreAudioTypes.pas +++ b/packages/univint/src/CoreAudioTypes.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/CoreFoundation.pas b/packages/univint/src/CoreFoundation.pas index 630e6199de..ccce607a2a 100644 --- a/packages/univint/src/CoreFoundation.pas +++ b/packages/univint/src/CoreFoundation.pas @@ -56,6 +56,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} @@ -74,6 +79,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} @@ -84,6 +90,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} @@ -94,6 +101,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} @@ -110,6 +118,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} @@ -120,13 +129,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__ } diff --git a/packages/univint/src/CoreGraphics.pas b/packages/univint/src/CoreGraphics.pas index aba567aeaa..44bb911b43 100644 --- a/packages/univint/src/CoreGraphics.pas +++ b/packages/univint/src/CoreGraphics.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/CoreText.pas b/packages/univint/src/CoreText.pas index 525aa89043..b7fc00b657 100644 --- a/packages/univint/src/CoreText.pas +++ b/packages/univint/src/CoreText.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/DADisk.pas b/packages/univint/src/DADisk.pas index 320b659420..2c90efbdc0 100644 --- a/packages/univint/src/DADisk.pas +++ b/packages/univint/src/DADisk.pas @@ -75,6 +75,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} @@ -93,6 +98,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} @@ -103,6 +109,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} @@ -113,6 +120,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} @@ -129,6 +137,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} @@ -139,13 +148,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__ } diff --git a/packages/univint/src/DASession.pas b/packages/univint/src/DASession.pas index c63f17e893..39c7e1f8de 100644 --- a/packages/univint/src/DASession.pas +++ b/packages/univint/src/DASession.pas @@ -75,6 +75,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} @@ -93,6 +98,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} @@ -103,6 +109,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} @@ -113,6 +120,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} @@ -129,6 +137,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} @@ -139,13 +148,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__ } diff --git a/packages/univint/src/DHCPClientPreferences.pas b/packages/univint/src/DHCPClientPreferences.pas index c52c796fcd..eebe16d457 100644 --- a/packages/univint/src/DHCPClientPreferences.pas +++ b/packages/univint/src/DHCPClientPreferences.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/DateTimeUtils.pas b/packages/univint/src/DateTimeUtils.pas index a40bda5b6f..8357c2bd27 100644 --- a/packages/univint/src/DateTimeUtils.pas +++ b/packages/univint/src/DateTimeUtils.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/Debugging.pas b/packages/univint/src/Debugging.pas index 0ab2128fdf..c5a41f8e27 100644 --- a/packages/univint/src/Debugging.pas +++ b/packages/univint/src/Debugging.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/Dialogs.pas b/packages/univint/src/Dialogs.pas index 9f0a046c61..ed8d162db5 100644 --- a/packages/univint/src/Dialogs.pas +++ b/packages/univint/src/Dialogs.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/Dictionary.pas b/packages/univint/src/Dictionary.pas index 3038ade315..2a15168849 100644 --- a/packages/univint/src/Dictionary.pas +++ b/packages/univint/src/Dictionary.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/DictionaryServices.pas b/packages/univint/src/DictionaryServices.pas index 8b782b4c7c..e006ddd291 100644 --- a/packages/univint/src/DictionaryServices.pas +++ b/packages/univint/src/DictionaryServices.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/DigitalHubRegistry.pas b/packages/univint/src/DigitalHubRegistry.pas index 824a1ef393..d6b3dc6041 100644 --- a/packages/univint/src/DigitalHubRegistry.pas +++ b/packages/univint/src/DigitalHubRegistry.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__ } diff --git a/packages/univint/src/Displays.pas b/packages/univint/src/Displays.pas index dae1a1c3b4..b59a11858b 100644 --- a/packages/univint/src/Displays.pas +++ b/packages/univint/src/Displays.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Drag.pas b/packages/univint/src/Drag.pas index 7575057437..78ac5710a2 100644 --- a/packages/univint/src/Drag.pas +++ b/packages/univint/src/Drag.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/DrawSprocket.pas b/packages/univint/src/DrawSprocket.pas index ecaa778189..fd1912f91a 100644 --- a/packages/univint/src/DrawSprocket.pas +++ b/packages/univint/src/DrawSprocket.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/DriverServices.pas b/packages/univint/src/DriverServices.pas index 25c51f69bb..92bc58ffb0 100644 --- a/packages/univint/src/DriverServices.pas +++ b/packages/univint/src/DriverServices.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/DriverSynchronization.pas b/packages/univint/src/DriverSynchronization.pas index 5f44813edd..1d43256de3 100644 --- a/packages/univint/src/DriverSynchronization.pas +++ b/packages/univint/src/DriverSynchronization.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Endian.pas b/packages/univint/src/Endian.pas index add6ac1ac6..21b614a5c5 100644 --- a/packages/univint/src/Endian.pas +++ b/packages/univint/src/Endian.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/Events.pas b/packages/univint/src/Events.pas index 89cf21e709..bf88f7379b 100644 --- a/packages/univint/src/Events.pas +++ b/packages/univint/src/Events.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/FSEvents.pas b/packages/univint/src/FSEvents.pas index 410ad610dc..72df18163b 100644 --- a/packages/univint/src/FSEvents.pas +++ b/packages/univint/src/FSEvents.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/FileTypesAndCreators.pas b/packages/univint/src/FileTypesAndCreators.pas index de967cb4ae..7c6ce2f06a 100644 --- a/packages/univint/src/FileTypesAndCreators.pas +++ b/packages/univint/src/FileTypesAndCreators.pas @@ -11,7 +11,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__ } diff --git a/packages/univint/src/Files.pas b/packages/univint/src/Files.pas index 2a72053a81..821f8b23a8 100644 --- a/packages/univint/src/Files.pas +++ b/packages/univint/src/Files.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Finder.pas b/packages/univint/src/Finder.pas index 942d1df1d1..dd37b64fe8 100644 --- a/packages/univint/src/Finder.pas +++ b/packages/univint/src/Finder.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/FinderRegistry.pas b/packages/univint/src/FinderRegistry.pas index ed12bb099b..a7d2d98c1a 100644 --- a/packages/univint/src/FinderRegistry.pas +++ b/packages/univint/src/FinderRegistry.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__ } diff --git a/packages/univint/src/FixMath.pas b/packages/univint/src/FixMath.pas index 94959e4125..cb1ad6cbc7 100644 --- a/packages/univint/src/FixMath.pas +++ b/packages/univint/src/FixMath.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/Folders.pas b/packages/univint/src/Folders.pas index a534ffedc4..19f7fceaf4 100644 --- a/packages/univint/src/Folders.pas +++ b/packages/univint/src/Folders.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/FontPanel.pas b/packages/univint/src/FontPanel.pas index c7d5a49150..0885c71ed2 100644 --- a/packages/univint/src/FontPanel.pas +++ b/packages/univint/src/FontPanel.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 } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -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__ } diff --git a/packages/univint/src/FontSync.pas b/packages/univint/src/FontSync.pas index 8f644b9f88..498204fef1 100644 --- a/packages/univint/src/FontSync.pas +++ b/packages/univint/src/FontSync.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Fonts.pas b/packages/univint/src/Fonts.pas index 3fa13ed353..d3285249df 100644 --- a/packages/univint/src/Fonts.pas +++ b/packages/univint/src/Fonts.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/GPCStrings.pas b/packages/univint/src/GPCStrings.pas index e8178aeeee..afa5a9cdc4 100644 --- a/packages/univint/src/GPCStrings.pas +++ b/packages/univint/src/GPCStrings.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/GestaltEqu.pas b/packages/univint/src/GestaltEqu.pas index 87fa4a5287..ff2a4ca3b1 100644 --- a/packages/univint/src/GestaltEqu.pas +++ b/packages/univint/src/GestaltEqu.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/HFSVolumes.pas b/packages/univint/src/HFSVolumes.pas index b0a4172ade..986c87f695 100644 --- a/packages/univint/src/HFSVolumes.pas +++ b/packages/univint/src/HFSVolumes.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/HIAccessibility.pas b/packages/univint/src/HIAccessibility.pas index e2f6570ece..357e56a1e9 100644 --- a/packages/univint/src/HIAccessibility.pas +++ b/packages/univint/src/HIAccessibility.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 } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIArchive.pas b/packages/univint/src/HIArchive.pas index 5daf6c87e7..b993334eb7 100644 --- a/packages/univint/src/HIArchive.pas +++ b/packages/univint/src/HIArchive.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/HIButtonViews.pas b/packages/univint/src/HIButtonViews.pas index c8d45c9ad3..887a178d43 100644 --- a/packages/univint/src/HIButtonViews.pas +++ b/packages/univint/src/HIButtonViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -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__ } diff --git a/packages/univint/src/HIClockView.pas b/packages/univint/src/HIClockView.pas index 47bfdba537..532cb4a20f 100644 --- a/packages/univint/src/HIClockView.pas +++ b/packages/univint/src/HIClockView.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIComboBox.pas b/packages/univint/src/HIComboBox.pas index c8966ded04..229745dcc3 100644 --- a/packages/univint/src/HIComboBox.pas +++ b/packages/univint/src/HIComboBox.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 } { Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIContainerViews.pas b/packages/univint/src/HIContainerViews.pas index b155b12471..477a5eeccd 100644 --- a/packages/univint/src/HIContainerViews.pas +++ b/packages/univint/src/HIContainerViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIDataBrowser.pas b/packages/univint/src/HIDataBrowser.pas index 9c98b59736..75492fce65 100644 --- a/packages/univint/src/HIDataBrowser.pas +++ b/packages/univint/src/HIDataBrowser.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -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__ } diff --git a/packages/univint/src/HIDisclosureViews.pas b/packages/univint/src/HIDisclosureViews.pas index 8d018fa828..8809c0ace7 100644 --- a/packages/univint/src/HIDisclosureViews.pas +++ b/packages/univint/src/HIDisclosureViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIGeometry.pas b/packages/univint/src/HIGeometry.pas index 7f038fc589..b3ac99f1b5 100644 --- a/packages/univint/src/HIGeometry.pas +++ b/packages/univint/src/HIGeometry.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/HIImageViews.pas b/packages/univint/src/HIImageViews.pas index ef8e5629ea..4ca54bb100 100644 --- a/packages/univint/src/HIImageViews.pas +++ b/packages/univint/src/HIImageViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -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__ } diff --git a/packages/univint/src/HILittleArrows.pas b/packages/univint/src/HILittleArrows.pas index 3b8ecf6919..636851c3ce 100644 --- a/packages/univint/src/HILittleArrows.pas +++ b/packages/univint/src/HILittleArrows.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIMenuView.pas b/packages/univint/src/HIMenuView.pas index 9ecb927e29..d1d9f823c7 100644 --- a/packages/univint/src/HIMenuView.pas +++ b/packages/univint/src/HIMenuView.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIMovieView.pas b/packages/univint/src/HIMovieView.pas index 49f3f2a578..2cd246f514 100644 --- a/packages/univint/src/HIMovieView.pas +++ b/packages/univint/src/HIMovieView.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 } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -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__ } diff --git a/packages/univint/src/HIObject.pas b/packages/univint/src/HIObject.pas index 88aa5350b2..b29a7ffe95 100644 --- a/packages/univint/src/HIObject.pas +++ b/packages/univint/src/HIObject.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 } { @@ -80,6 +80,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} @@ -98,6 +103,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 +114,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} @@ -118,6 +125,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} @@ -134,6 +142,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} @@ -144,13 +153,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__ } diff --git a/packages/univint/src/HIPopupButton.pas b/packages/univint/src/HIPopupButton.pas index e019785b6c..b932287d6d 100644 --- a/packages/univint/src/HIPopupButton.pas +++ b/packages/univint/src/HIPopupButton.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIProgressViews.pas b/packages/univint/src/HIProgressViews.pas index 8a65550c20..99c9bd9916 100644 --- a/packages/univint/src/HIProgressViews.pas +++ b/packages/univint/src/HIProgressViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIRelevanceBar.pas b/packages/univint/src/HIRelevanceBar.pas index cba9b49b9e..c93d927cb3 100644 --- a/packages/univint/src/HIRelevanceBar.pas +++ b/packages/univint/src/HIRelevanceBar.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIScrollView.pas b/packages/univint/src/HIScrollView.pas index 595b27f11f..f18443f7b6 100644 --- a/packages/univint/src/HIScrollView.pas +++ b/packages/univint/src/HIScrollView.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HISearchField.pas b/packages/univint/src/HISearchField.pas index fbc42ecdb3..45033a78e6 100644 --- a/packages/univint/src/HISearchField.pas +++ b/packages/univint/src/HISearchField.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HISegmentedView.pas b/packages/univint/src/HISegmentedView.pas index c2629c7aa2..96a10206b7 100644 --- a/packages/univint/src/HISegmentedView.pas +++ b/packages/univint/src/HISegmentedView.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HISeparator.pas b/packages/univint/src/HISeparator.pas index b1c6319f4d..05033938ac 100644 --- a/packages/univint/src/HISeparator.pas +++ b/packages/univint/src/HISeparator.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HIShape.pas b/packages/univint/src/HIShape.pas index f34e6733b0..1f97c9a554 100644 --- a/packages/univint/src/HIShape.pas +++ b/packages/univint/src/HIShape.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 } { File: HIShape.p(.pas) } @@ -93,6 +93,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} @@ -111,6 +116,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} @@ -121,6 +127,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} @@ -131,6 +138,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} @@ -147,6 +155,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} @@ -157,13 +166,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__ } diff --git a/packages/univint/src/HISlider.pas b/packages/univint/src/HISlider.pas index 4650f0ab50..4a7935e4ee 100644 --- a/packages/univint/src/HISlider.pas +++ b/packages/univint/src/HISlider.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HITabbedView.pas b/packages/univint/src/HITabbedView.pas index 854398847c..fdcd888d33 100644 --- a/packages/univint/src/HITabbedView.pas +++ b/packages/univint/src/HITabbedView.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HITextLengthFilter.pas b/packages/univint/src/HITextLengthFilter.pas index e478c90e7b..620bc74e24 100644 --- a/packages/univint/src/HITextLengthFilter.pas +++ b/packages/univint/src/HITextLengthFilter.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HITextUtils.pas b/packages/univint/src/HITextUtils.pas index 3df1368cb6..8aeb63efa3 100644 --- a/packages/univint/src/HITextUtils.pas +++ b/packages/univint/src/HITextUtils.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/HITextViews.pas b/packages/univint/src/HITextViews.pas index 2524da1d1e..84dffc66c3 100644 --- a/packages/univint/src/HITextViews.pas +++ b/packages/univint/src/HITextViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HITheme.pas b/packages/univint/src/HITheme.pas index 6585ad176c..0d6c54abd1 100644 --- a/packages/univint/src/HITheme.pas +++ b/packages/univint/src/HITheme.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/HIToolbar.pas b/packages/univint/src/HIToolbar.pas index b5c1ec2fad..4dd2f3c4cc 100644 --- a/packages/univint/src/HIToolbar.pas +++ b/packages/univint/src/HIToolbar.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 } { File: HIToolbar.p(.pas) } @@ -105,6 +105,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} @@ -123,6 +128,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} @@ -133,6 +139,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} @@ -143,6 +150,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} @@ -159,6 +167,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} @@ -169,13 +178,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__ } diff --git a/packages/univint/src/HIToolbox.pas b/packages/univint/src/HIToolbox.pas index 63e7a615cc..d40ac5c2b7 100644 --- a/packages/univint/src/HIToolbox.pas +++ b/packages/univint/src/HIToolbox.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/HIToolboxDebugging.pas b/packages/univint/src/HIToolboxDebugging.pas index c7f620cf0c..97764c302d 100644 --- a/packages/univint/src/HIToolboxDebugging.pas +++ b/packages/univint/src/HIToolboxDebugging.pas @@ -54,6 +54,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} @@ -72,6 +77,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} @@ -82,6 +88,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} @@ -92,6 +99,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} @@ -108,6 +116,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} @@ -118,13 +127,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__ } diff --git a/packages/univint/src/HIView.pas b/packages/univint/src/HIView.pas index f229b19f2a..b6b4b8a487 100644 --- a/packages/univint/src/HIView.pas +++ b/packages/univint/src/HIView.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 } { File: HIView.p(.pas) } @@ -104,6 +104,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} @@ -122,6 +127,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} @@ -132,6 +138,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} @@ -142,6 +149,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} @@ -158,6 +166,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} @@ -168,13 +177,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__ } diff --git a/packages/univint/src/HIWindowViews.pas b/packages/univint/src/HIWindowViews.pas index e6fb114d6f..a077f08b7a 100644 --- a/packages/univint/src/HIWindowViews.pas +++ b/packages/univint/src/HIWindowViews.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 } { Initial Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HTMLRendering.pas b/packages/univint/src/HTMLRendering.pas index 244c98ebba..21932d20de 100644 --- a/packages/univint/src/HTMLRendering.pas +++ b/packages/univint/src/HTMLRendering.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/HostTime.pas b/packages/univint/src/HostTime.pas index f7c4e9097e..637e68acd0 100644 --- a/packages/univint/src/HostTime.pas +++ b/packages/univint/src/HostTime.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org ==================================================================================================} { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/IBCarbonRuntime.pas b/packages/univint/src/IBCarbonRuntime.pas index 83d8f0a9f3..4173d9811b 100644 --- a/packages/univint/src/IBCarbonRuntime.pas +++ b/packages/univint/src/IBCarbonRuntime.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/ICAApplication.pas b/packages/univint/src/ICAApplication.pas index afec2cd3f9..00e8486bd5 100644 --- a/packages/univint/src/ICAApplication.pas +++ b/packages/univint/src/ICAApplication.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/ICACamera.pas b/packages/univint/src/ICACamera.pas index 16f821a390..f1ecf6c908 100644 --- a/packages/univint/src/ICACamera.pas +++ b/packages/univint/src/ICACamera.pas @@ -5,7 +5,7 @@ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved. * * For bug reports, consult the following page onthe World Wide Web: - * http://www.freepascal.org/bugs.html + * http://bugs.freepascal.org * *----------------------------------------------------------------------------------------------------------------------------} { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/ICADevice.pas b/packages/univint/src/ICADevice.pas index 89d4ad0e18..53f0af3bc8 100644 --- a/packages/univint/src/ICADevice.pas +++ b/packages/univint/src/ICADevice.pas @@ -5,7 +5,7 @@ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved. * * For bug reports, consult the following page onthe World Wide Web: - * http://www.freepascal.org/bugs.html + * http://bugs.freepascal.org * *----------------------------------------------------------------------------------------------------------------------------} { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/IOKitReturn.pas b/packages/univint/src/IOKitReturn.pas index a5d187f2ae..9da75aa2bf 100644 --- a/packages/univint/src/IOKitReturn.pas +++ b/packages/univint/src/IOKitReturn.pas @@ -80,6 +80,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} @@ -98,6 +103,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 +114,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} @@ -118,6 +125,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} @@ -134,6 +142,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} @@ -144,13 +153,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__ } diff --git a/packages/univint/src/IOSurfaceAPI.pas b/packages/univint/src/IOSurfaceAPI.pas index a9e9a3610f..bbccf0b009 100644 --- a/packages/univint/src/IOSurfaceAPI.pas +++ b/packages/univint/src/IOSurfaceAPI.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/IconStorage.pas b/packages/univint/src/IconStorage.pas index c9cc0dc7b3..545e4d3427 100644 --- a/packages/univint/src/IconStorage.pas +++ b/packages/univint/src/IconStorage.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Initial Pascal Translation: Gorazd Krosl, <gorazd_1957@yahoo.ca>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/Icons.pas b/packages/univint/src/Icons.pas index be0b6406ae..289a03dfa0 100644 --- a/packages/univint/src/Icons.pas +++ b/packages/univint/src/Icons.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 } @@ -73,6 +73,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} @@ -91,6 +96,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} @@ -101,6 +107,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} @@ -111,6 +118,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} @@ -127,6 +135,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} @@ -137,13 +146,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__ } diff --git a/packages/univint/src/IconsCore.pas b/packages/univint/src/IconsCore.pas index ed1636ec7d..4b818281b2 100644 --- a/packages/univint/src/IconsCore.pas +++ b/packages/univint/src/IconsCore.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Initial Pascal Translation: Gorazd Krosl, <gorazd_1957@yahoo.ca>, October 2009 } { Updated Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, September 2012 } @@ -66,6 +66,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} @@ -84,6 +89,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} @@ -94,6 +100,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} @@ -104,6 +111,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} @@ -120,6 +128,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} @@ -130,13 +139,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__ } diff --git a/packages/univint/src/ImageCodec.pas b/packages/univint/src/ImageCodec.pas index 1fbf96f3e8..3d03b9c79c 100644 --- a/packages/univint/src/ImageCodec.pas +++ b/packages/univint/src/ImageCodec.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/ImageCompression.pas b/packages/univint/src/ImageCompression.pas index 6f19234cca..0dcc08017e 100644 --- a/packages/univint/src/ImageCompression.pas +++ b/packages/univint/src/ImageCompression.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/InternetConfig.pas b/packages/univint/src/InternetConfig.pas index 4a4754e44b..ef69e47e56 100644 --- a/packages/univint/src/InternetConfig.pas +++ b/packages/univint/src/InternetConfig.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/IntlResources.pas b/packages/univint/src/IntlResources.pas index 9a174aa693..713b3bcfe3 100644 --- a/packages/univint/src/IntlResources.pas +++ b/packages/univint/src/IntlResources.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/Keyboards.pas b/packages/univint/src/Keyboards.pas index b3479d0c8d..f4657a24e2 100644 --- a/packages/univint/src/Keyboards.pas +++ b/packages/univint/src/Keyboards.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/KeychainCore.pas b/packages/univint/src/KeychainCore.pas index 3ea97c38d2..0775f9588a 100644 --- a/packages/univint/src/KeychainCore.pas +++ b/packages/univint/src/KeychainCore.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/KeychainHI.pas b/packages/univint/src/KeychainHI.pas index a64c2d1506..e7274c4ac4 100644 --- a/packages/univint/src/KeychainHI.pas +++ b/packages/univint/src/KeychainHI.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/LSInfo.pas b/packages/univint/src/LSInfo.pas index 4b5f80d7e7..2029e73e10 100644 --- a/packages/univint/src/LSInfo.pas +++ b/packages/univint/src/LSInfo.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Updated Pascal Translation: Jonas Maebe <jonas@freepascal.org>, September 2012 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/LSOpen.pas b/packages/univint/src/LSOpen.pas index 739ebca93c..ec96b18add 100644 --- a/packages/univint/src/LSOpen.pas +++ b/packages/univint/src/LSOpen.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Updated Pascal Translation: Jonas Maebe <jonas@freepascal.org>, September 2012 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/LSQuarantine.pas b/packages/univint/src/LSQuarantine.pas index e95aefe8e9..29b13eae5d 100644 --- a/packages/univint/src/LSQuarantine.pas +++ b/packages/univint/src/LSQuarantine.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Updated Pascal Translation: Jonas Maebe <jonas@freepascal.org>, September 2012 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/LSSharedFileList.pas b/packages/univint/src/LSSharedFileList.pas index 606e1b21c3..f2d78ab4a0 100644 --- a/packages/univint/src/LSSharedFileList.pas +++ b/packages/univint/src/LSSharedFileList.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Updated Pascal Translation: Jonas Maebe <jonas@freepascal.org>, September 2012 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/LanguageAnalysis.pas b/packages/univint/src/LanguageAnalysis.pas index a22dcfab86..bf0d23546b 100644 --- a/packages/univint/src/LanguageAnalysis.pas +++ b/packages/univint/src/LanguageAnalysis.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/Lists.pas b/packages/univint/src/Lists.pas index 3dc101ec10..c9b6cf04c5 100644 --- a/packages/univint/src/Lists.pas +++ b/packages/univint/src/Lists.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/LowMem.pas b/packages/univint/src/LowMem.pas index f3b08252d1..f2dcaed00b 100644 --- a/packages/univint/src/LowMem.pas +++ b/packages/univint/src/LowMem.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/MDExternalDatastore.pas b/packages/univint/src/MDExternalDatastore.pas index aa75f709fa..7f536f9204 100644 --- a/packages/univint/src/MDExternalDatastore.pas +++ b/packages/univint/src/MDExternalDatastore.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/MDImporter.pas b/packages/univint/src/MDImporter.pas index d72cab1daf..1990a1f685 100644 --- a/packages/univint/src/MDImporter.pas +++ b/packages/univint/src/MDImporter.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/MDItem.pas b/packages/univint/src/MDItem.pas index 1d717ff4d5..a12ff2b1c9 100644 --- a/packages/univint/src/MDItem.pas +++ b/packages/univint/src/MDItem.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/MDLineage.pas b/packages/univint/src/MDLineage.pas index 119d7f1e3c..80332e9861 100644 --- a/packages/univint/src/MDLineage.pas +++ b/packages/univint/src/MDLineage.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/MDQuery.pas b/packages/univint/src/MDQuery.pas index 91b46693b8..1d4487da09 100644 --- a/packages/univint/src/MDQuery.pas +++ b/packages/univint/src/MDQuery.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/MDSchema.pas b/packages/univint/src/MDSchema.pas index 4e1b1c8416..e675cf2b93 100644 --- a/packages/univint/src/MDSchema.pas +++ b/packages/univint/src/MDSchema.pas @@ -59,6 +59,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} @@ -77,6 +82,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} @@ -87,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} @@ -97,6 +104,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} @@ -113,6 +121,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} @@ -123,13 +132,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__ } diff --git a/packages/univint/src/MIDIDriver.pas b/packages/univint/src/MIDIDriver.pas index 2623d44b7f..93852dad21 100644 --- a/packages/univint/src/MIDIDriver.pas +++ b/packages/univint/src/MIDIDriver.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } { Pascal Translation Update: Jonas Maebe <jonas@freepascal.org>, October 2012 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/MIDIServices.pas b/packages/univint/src/MIDIServices.pas index 4fa60335f7..9819caea31 100644 --- a/packages/univint/src/MIDIServices.pas +++ b/packages/univint/src/MIDIServices.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/MIDISetup.pas b/packages/univint/src/MIDISetup.pas index 6a65ab9311..1139cdad91 100644 --- a/packages/univint/src/MIDISetup.pas +++ b/packages/univint/src/MIDISetup.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/MIDIThruConnection.pas b/packages/univint/src/MIDIThruConnection.pas index d3bef27dd2..b557ec53c7 100644 --- a/packages/univint/src/MIDIThruConnection.pas +++ b/packages/univint/src/MIDIThruConnection.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/MacApplication.pas b/packages/univint/src/MacApplication.pas index d6bc87e496..b49cfd0e75 100644 --- a/packages/univint/src/MacApplication.pas +++ b/packages/univint/src/MacApplication.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/MacErrors.pas b/packages/univint/src/MacErrors.pas index af4dae55cb..1e8a0d4332 100644 --- a/packages/univint/src/MacErrors.pas +++ b/packages/univint/src/MacErrors.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/MacHelp.pas b/packages/univint/src/MacHelp.pas index d41128e583..c1652ec087 100644 --- a/packages/univint/src/MacHelp.pas +++ b/packages/univint/src/MacHelp.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/MacLocales.pas b/packages/univint/src/MacLocales.pas index 275e33ce2c..29c47fee1d 100644 --- a/packages/univint/src/MacLocales.pas +++ b/packages/univint/src/MacLocales.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/MacMemory.pas b/packages/univint/src/MacMemory.pas index 890b3431c8..fd3d484905 100644 --- a/packages/univint/src/MacMemory.pas +++ b/packages/univint/src/MacMemory.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/MacOSAll.pas b/packages/univint/src/MacOSAll.pas index b4d7706d1a..56a38a7cf2 100644 --- a/packages/univint/src/MacOSAll.pas +++ b/packages/univint/src/MacOSAll.pas @@ -56,6 +56,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} @@ -74,6 +79,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} @@ -84,6 +90,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} @@ -94,6 +101,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} @@ -110,6 +118,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} @@ -120,13 +129,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__ } diff --git a/packages/univint/src/MacOSXPosix.pas b/packages/univint/src/MacOSXPosix.pas index 05ed94cfa5..d0e8f1dff5 100644 --- a/packages/univint/src/MacOSXPosix.pas +++ b/packages/univint/src/MacOSXPosix.pas @@ -58,6 +58,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} @@ -76,6 +81,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} @@ -86,6 +92,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} @@ -96,6 +103,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} @@ -112,6 +120,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} @@ -122,13 +131,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__ } diff --git a/packages/univint/src/MacOpenGL.pas b/packages/univint/src/MacOpenGL.pas index 736ee9fbc1..4762afbf1c 100644 --- a/packages/univint/src/MacOpenGL.pas +++ b/packages/univint/src/MacOpenGL.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/MacTextEditor.pas b/packages/univint/src/MacTextEditor.pas index 0830ff0c3c..ad2925db31 100644 --- a/packages/univint/src/MacTextEditor.pas +++ b/packages/univint/src/MacTextEditor.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/MacTypes.pas b/packages/univint/src/MacTypes.pas index ee09dfecf9..f036eea5e5 100644 --- a/packages/univint/src/MacTypes.pas +++ b/packages/univint/src/MacTypes.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/MacWindows.pas b/packages/univint/src/MacWindows.pas index ca10084c38..5669dcef58 100644 --- a/packages/univint/src/MacWindows.pas +++ b/packages/univint/src/MacWindows.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/MachineExceptions.pas b/packages/univint/src/MachineExceptions.pas index f05e0c27db..5ca0693c10 100644 --- a/packages/univint/src/MachineExceptions.pas +++ b/packages/univint/src/MachineExceptions.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Math64.pas b/packages/univint/src/Math64.pas index 9bfe2fdf1b..5f22687802 100644 --- a/packages/univint/src/Math64.pas +++ b/packages/univint/src/Math64.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/MediaHandlers.pas b/packages/univint/src/MediaHandlers.pas index ac23fac128..68e81b5804 100644 --- a/packages/univint/src/MediaHandlers.pas +++ b/packages/univint/src/MediaHandlers.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/Menus.pas b/packages/univint/src/Menus.pas index e9a5542ff8..05a7a90347 100644 --- a/packages/univint/src/Menus.pas +++ b/packages/univint/src/Menus.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/MixedMode.pas b/packages/univint/src/MixedMode.pas index aba48b6827..fbaa7022fd 100644 --- a/packages/univint/src/MixedMode.pas +++ b/packages/univint/src/MixedMode.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Movies.pas b/packages/univint/src/Movies.pas index bef857b243..ca82570dd7 100644 --- a/packages/univint/src/Movies.pas +++ b/packages/univint/src/Movies.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/MoviesFormat.pas b/packages/univint/src/MoviesFormat.pas index 0a4b8e02e9..a15ca995e7 100644 --- a/packages/univint/src/MoviesFormat.pas +++ b/packages/univint/src/MoviesFormat.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/MultiProcessingInfo.pas b/packages/univint/src/MultiProcessingInfo.pas index 7052f973ac..3538810925 100644 --- a/packages/univint/src/MultiProcessingInfo.pas +++ b/packages/univint/src/MultiProcessingInfo.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/Multiprocessing.pas b/packages/univint/src/Multiprocessing.pas index 5fbbbfefa0..0116c5e426 100644 --- a/packages/univint/src/Multiprocessing.pas +++ b/packages/univint/src/Multiprocessing.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/MusicDevice.pas b/packages/univint/src/MusicDevice.pas index 3c67ccc4f2..6d3f1170b4 100644 --- a/packages/univint/src/MusicDevice.pas +++ b/packages/univint/src/MusicDevice.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/NSL.pas b/packages/univint/src/NSL.pas index 692ac0aec9..4aee224990 100644 --- a/packages/univint/src/NSL.pas +++ b/packages/univint/src/NSL.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/NSLCore.pas b/packages/univint/src/NSLCore.pas index f7d52c8d23..fd1f848120 100644 --- a/packages/univint/src/NSLCore.pas +++ b/packages/univint/src/NSLCore.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Navigation.pas b/packages/univint/src/Navigation.pas index 1df09f469c..f349bbaa79 100644 --- a/packages/univint/src/Navigation.pas +++ b/packages/univint/src/Navigation.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/Notification.pas b/packages/univint/src/Notification.pas index d5ae5a5341..15c7c5842c 100644 --- a/packages/univint/src/Notification.pas +++ b/packages/univint/src/Notification.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/NumberFormatting.pas b/packages/univint/src/NumberFormatting.pas index b60579030d..3649780bec 100644 --- a/packages/univint/src/NumberFormatting.pas +++ b/packages/univint/src/NumberFormatting.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/OSA.pas b/packages/univint/src/OSA.pas index 822d16fe7f..dc9a61cef6 100644 --- a/packages/univint/src/OSA.pas +++ b/packages/univint/src/OSA.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__ } 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__ } diff --git a/packages/univint/src/OSAGeneric.pas b/packages/univint/src/OSAGeneric.pas index 96092f7176..09819b5504 100644 --- a/packages/univint/src/OSAGeneric.pas +++ b/packages/univint/src/OSAGeneric.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__ } diff --git a/packages/univint/src/OSUtils.pas b/packages/univint/src/OSUtils.pas index 4b19ce2674..30b40a140e 100644 --- a/packages/univint/src/OSUtils.pas +++ b/packages/univint/src/OSUtils.pas @@ -64,6 +64,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} @@ -82,6 +87,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} @@ -92,6 +98,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} @@ -102,6 +109,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} @@ -118,6 +126,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} @@ -128,13 +137,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__ } diff --git a/packages/univint/src/ObjCRuntime.pas b/packages/univint/src/ObjCRuntime.pas index 460da8bc08..97eed94a27 100644 --- a/packages/univint/src/ObjCRuntime.pas +++ b/packages/univint/src/ObjCRuntime.pas @@ -101,6 +101,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} @@ -119,6 +124,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} @@ -129,6 +135,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} @@ -139,6 +146,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} @@ -155,6 +163,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} @@ -165,13 +174,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__ } diff --git a/packages/univint/src/OpenTransport.pas b/packages/univint/src/OpenTransport.pas index 75a03e3c12..b46d00685e 100644 --- a/packages/univint/src/OpenTransport.pas +++ b/packages/univint/src/OpenTransport.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, November 2005 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/OpenTransportProtocol.pas b/packages/univint/src/OpenTransportProtocol.pas index 48d8574aa3..d370368b00 100644 --- a/packages/univint/src/OpenTransportProtocol.pas +++ b/packages/univint/src/OpenTransportProtocol.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, November 2005 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/OpenTransportProviders.pas b/packages/univint/src/OpenTransportProviders.pas index fb939911f7..fc933d89b2 100644 --- a/packages/univint/src/OpenTransportProviders.pas +++ b/packages/univint/src/OpenTransportProviders.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, November 2005 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/PEFBinaryFormat.pas b/packages/univint/src/PEFBinaryFormat.pas index b178d8e7e9..b46ba1da28 100644 --- a/packages/univint/src/PEFBinaryFormat.pas +++ b/packages/univint/src/PEFBinaryFormat.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/PLStringFuncs.pas b/packages/univint/src/PLStringFuncs.pas index 103f97217d..6b49f3fb2c 100644 --- a/packages/univint/src/PLStringFuncs.pas +++ b/packages/univint/src/PLStringFuncs.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/PMApplication.pas b/packages/univint/src/PMApplication.pas index 937d211f1c..ccde23cb20 100644 --- a/packages/univint/src/PMApplication.pas +++ b/packages/univint/src/PMApplication.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMApplicationDeprecated.pas b/packages/univint/src/PMApplicationDeprecated.pas index 9fadcbb30e..2f901a4b86 100644 --- a/packages/univint/src/PMApplicationDeprecated.pas +++ b/packages/univint/src/PMApplicationDeprecated.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMCore.pas b/packages/univint/src/PMCore.pas index e6c723f26d..5a5f7ef166 100644 --- a/packages/univint/src/PMCore.pas +++ b/packages/univint/src/PMCore.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMCoreDeprecated.pas b/packages/univint/src/PMCoreDeprecated.pas index 9c840cc5d1..322ed2cae6 100644 --- a/packages/univint/src/PMCoreDeprecated.pas +++ b/packages/univint/src/PMCoreDeprecated.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMDefinitions.pas b/packages/univint/src/PMDefinitions.pas index 091c8eeed1..da66b386a0 100644 --- a/packages/univint/src/PMDefinitions.pas +++ b/packages/univint/src/PMDefinitions.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMDefinitionsDeprecated.pas b/packages/univint/src/PMDefinitionsDeprecated.pas index e3d1f17ae8..2c0e879a27 100644 --- a/packages/univint/src/PMDefinitionsDeprecated.pas +++ b/packages/univint/src/PMDefinitionsDeprecated.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMErrors.pas b/packages/univint/src/PMErrors.pas index 6d78af473b..22f83f07fb 100644 --- a/packages/univint/src/PMErrors.pas +++ b/packages/univint/src/PMErrors.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/PMPrintAETypes.pas b/packages/univint/src/PMPrintAETypes.pas index af32bd0a09..cd63678e22 100644 --- a/packages/univint/src/PMPrintAETypes.pas +++ b/packages/univint/src/PMPrintAETypes.pas @@ -11,7 +11,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } { @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/PMPrintSettingsKeys.pas b/packages/univint/src/PMPrintSettingsKeys.pas index 8c24e23e95..f9f1fb908d 100644 --- a/packages/univint/src/PMPrintSettingsKeys.pas +++ b/packages/univint/src/PMPrintSettingsKeys.pas @@ -11,7 +11,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -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__ } diff --git a/packages/univint/src/PMPrintingDialogExtensions.pas b/packages/univint/src/PMPrintingDialogExtensions.pas index 9933428593..5b03809ff5 100644 --- a/packages/univint/src/PMPrintingDialogExtensions.pas +++ b/packages/univint/src/PMPrintingDialogExtensions.pas @@ -11,7 +11,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2012 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/Palettes.pas b/packages/univint/src/Palettes.pas index 0252334020..62d381549a 100644 --- a/packages/univint/src/Palettes.pas +++ b/packages/univint/src/Palettes.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Pasteboard.pas b/packages/univint/src/Pasteboard.pas index 8b6213ee5f..7f03df7c1c 100644 --- a/packages/univint/src/Pasteboard.pas +++ b/packages/univint/src/Pasteboard.pas @@ -41,7 +41,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -100,6 +100,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} @@ -118,6 +123,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} @@ -128,6 +134,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} @@ -138,6 +145,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} @@ -154,6 +162,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} @@ -164,13 +173,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__ } diff --git a/packages/univint/src/PictUtils.pas b/packages/univint/src/PictUtils.pas index c3985aba58..4a1c739415 100644 --- a/packages/univint/src/PictUtils.pas +++ b/packages/univint/src/PictUtils.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Power.pas b/packages/univint/src/Power.pas index af7439adbf..ac63329ce9 100644 --- a/packages/univint/src/Power.pas +++ b/packages/univint/src/Power.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/Processes.pas b/packages/univint/src/Processes.pas index 1d814351fc..80b726baec 100644 --- a/packages/univint/src/Processes.pas +++ b/packages/univint/src/Processes.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/QDCMCommon.pas b/packages/univint/src/QDCMCommon.pas index a00ea83aa0..aab82835da 100644 --- a/packages/univint/src/QDCMCommon.pas +++ b/packages/univint/src/QDCMCommon.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/QDOffscreen.pas b/packages/univint/src/QDOffscreen.pas index 536dd00325..9862436ba8 100644 --- a/packages/univint/src/QDOffscreen.pas +++ b/packages/univint/src/QDOffscreen.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/QDPictToCGContext.pas b/packages/univint/src/QDPictToCGContext.pas index 7875e13d08..fb2ae249f4 100644 --- a/packages/univint/src/QDPictToCGContext.pas +++ b/packages/univint/src/QDPictToCGContext.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 } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2004 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QLBase.pas b/packages/univint/src/QLBase.pas index 634819ad32..2436084414 100644 --- a/packages/univint/src/QLBase.pas +++ b/packages/univint/src/QLBase.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/QLGenerator.pas b/packages/univint/src/QLGenerator.pas index 8b1c65b932..ba0d2bd836 100644 --- a/packages/univint/src/QLGenerator.pas +++ b/packages/univint/src/QLGenerator.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/QLThumbnail.pas b/packages/univint/src/QLThumbnail.pas index e0cc3ead6a..5dcf165ebe 100644 --- a/packages/univint/src/QLThumbnail.pas +++ b/packages/univint/src/QLThumbnail.pas @@ -61,6 +61,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} @@ -79,6 +84,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} @@ -89,6 +95,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} @@ -99,6 +106,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} @@ -115,6 +123,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} @@ -125,13 +134,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__ } diff --git a/packages/univint/src/QLThumbnailImage.pas b/packages/univint/src/QLThumbnailImage.pas index 0d664141ae..0c9c91250c 100644 --- a/packages/univint/src/QLThumbnailImage.pas +++ b/packages/univint/src/QLThumbnailImage.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/QTML.pas b/packages/univint/src/QTML.pas index 071c92debd..13016ff667 100644 --- a/packages/univint/src/QTML.pas +++ b/packages/univint/src/QTML.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QTSMovie.pas b/packages/univint/src/QTSMovie.pas index 64a0384479..d47efe9085 100644 --- a/packages/univint/src/QTSMovie.pas +++ b/packages/univint/src/QTSMovie.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/QTStreamingComponents.pas b/packages/univint/src/QTStreamingComponents.pas index ea8ae908b8..da89f37616 100644 --- a/packages/univint/src/QTStreamingComponents.pas +++ b/packages/univint/src/QTStreamingComponents.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeComponents.pas b/packages/univint/src/QuickTimeComponents.pas index c58ff5c80b..2f9e8fa037 100644 --- a/packages/univint/src/QuickTimeComponents.pas +++ b/packages/univint/src/QuickTimeComponents.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeErrors.pas b/packages/univint/src/QuickTimeErrors.pas index 4c35e94b2c..5fbc82c2a2 100644 --- a/packages/univint/src/QuickTimeErrors.pas +++ b/packages/univint/src/QuickTimeErrors.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeMusic.pas b/packages/univint/src/QuickTimeMusic.pas index 542af0c760..dbfbb549af 100644 --- a/packages/univint/src/QuickTimeMusic.pas +++ b/packages/univint/src/QuickTimeMusic.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeStreaming.pas b/packages/univint/src/QuickTimeStreaming.pas index 7c2440744b..cfe1289863 100644 --- a/packages/univint/src/QuickTimeStreaming.pas +++ b/packages/univint/src/QuickTimeStreaming.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeVR.pas b/packages/univint/src/QuickTimeVR.pas index 5917a13414..585d0e83e8 100644 --- a/packages/univint/src/QuickTimeVR.pas +++ b/packages/univint/src/QuickTimeVR.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickTimeVRFormat.pas b/packages/univint/src/QuickTimeVRFormat.pas index 83a26b2d78..3f17301664 100644 --- a/packages/univint/src/QuickTimeVRFormat.pas +++ b/packages/univint/src/QuickTimeVRFormat.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/Quickdraw.pas b/packages/univint/src/Quickdraw.pas index b82277157b..d089ba88cd 100644 --- a/packages/univint/src/Quickdraw.pas +++ b/packages/univint/src/Quickdraw.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 } { Pascal Translation Updated: Gale R Paeper, <gpaeper@empirenet.com>, 2007 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/QuickdrawText.pas b/packages/univint/src/QuickdrawText.pas index 3f91ba5338..d6c5b2bc86 100644 --- a/packages/univint/src/QuickdrawText.pas +++ b/packages/univint/src/QuickdrawText.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/QuickdrawTypes.pas b/packages/univint/src/QuickdrawTypes.pas index ca9907e92f..6f6c1a0941 100644 --- a/packages/univint/src/QuickdrawTypes.pas +++ b/packages/univint/src/QuickdrawTypes.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/Resources.pas b/packages/univint/src/Resources.pas index 15476c80c0..9a0040ee42 100644 --- a/packages/univint/src/Resources.pas +++ b/packages/univint/src/Resources.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/SCDynamicStore.pas b/packages/univint/src/SCDynamicStore.pas index 29f650cd25..c62e2d2d1e 100644 --- a/packages/univint/src/SCDynamicStore.pas +++ b/packages/univint/src/SCDynamicStore.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCDynamicStoreCopyDHCPInfos.pas b/packages/univint/src/SCDynamicStoreCopyDHCPInfos.pas index 9f58ad71c8..66a02a1750 100644 --- a/packages/univint/src/SCDynamicStoreCopyDHCPInfos.pas +++ b/packages/univint/src/SCDynamicStoreCopyDHCPInfos.pas @@ -79,6 +79,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} @@ -97,6 +102,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} @@ -107,6 +113,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} @@ -117,6 +124,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} @@ -133,6 +141,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} @@ -143,13 +152,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__ } diff --git a/packages/univint/src/SCDynamicStoreCopySpecific.pas b/packages/univint/src/SCDynamicStoreCopySpecific.pas index a518ee39ea..5b8f234a1d 100644 --- a/packages/univint/src/SCDynamicStoreCopySpecific.pas +++ b/packages/univint/src/SCDynamicStoreCopySpecific.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCDynamicStoreKey.pas b/packages/univint/src/SCDynamicStoreKey.pas index 64aeef7cae..0fedc8e544 100644 --- a/packages/univint/src/SCDynamicStoreKey.pas +++ b/packages/univint/src/SCDynamicStoreKey.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCNetwork.pas b/packages/univint/src/SCNetwork.pas index e7b8e59732..3aa34469bf 100644 --- a/packages/univint/src/SCNetwork.pas +++ b/packages/univint/src/SCNetwork.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCNetworkConfiguration.pas b/packages/univint/src/SCNetworkConfiguration.pas index d796aa22ba..237e25c458 100644 --- a/packages/univint/src/SCNetworkConfiguration.pas +++ b/packages/univint/src/SCNetworkConfiguration.pas @@ -76,6 +76,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} @@ -94,6 +99,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} @@ -104,6 +110,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} @@ -114,6 +121,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} @@ -130,6 +138,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} @@ -140,13 +149,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__ } diff --git a/packages/univint/src/SCNetworkConnection.pas b/packages/univint/src/SCNetworkConnection.pas index 8c966becf7..247fa0bbff 100644 --- a/packages/univint/src/SCNetworkConnection.pas +++ b/packages/univint/src/SCNetworkConnection.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCNetworkReachability.pas b/packages/univint/src/SCNetworkReachability.pas index 0dbc8506c9..7d683c1d47 100644 --- a/packages/univint/src/SCNetworkReachability.pas +++ b/packages/univint/src/SCNetworkReachability.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCPreferences.pas b/packages/univint/src/SCPreferences.pas index d9bf212333..38edf4869c 100644 --- a/packages/univint/src/SCPreferences.pas +++ b/packages/univint/src/SCPreferences.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCPreferencesPath.pas b/packages/univint/src/SCPreferencesPath.pas index c7a342c0c5..cab1cdc19d 100644 --- a/packages/univint/src/SCPreferencesPath.pas +++ b/packages/univint/src/SCPreferencesPath.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCPreferencesSetSpecific.pas b/packages/univint/src/SCPreferencesSetSpecific.pas index d2897684f2..5e4616c289 100644 --- a/packages/univint/src/SCPreferencesSetSpecific.pas +++ b/packages/univint/src/SCPreferencesSetSpecific.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SCSI.pas b/packages/univint/src/SCSI.pas index 32cb36ceb3..445f824b38 100644 --- a/packages/univint/src/SCSI.pas +++ b/packages/univint/src/SCSI.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/SCSchemaDefinitions.pas b/packages/univint/src/SCSchemaDefinitions.pas index adcb3566dc..6aed3471e5 100644 --- a/packages/univint/src/SCSchemaDefinitions.pas +++ b/packages/univint/src/SCSchemaDefinitions.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SFNTLayoutTypes.pas b/packages/univint/src/SFNTLayoutTypes.pas index 1565c23478..fbf9f61880 100644 --- a/packages/univint/src/SFNTLayoutTypes.pas +++ b/packages/univint/src/SFNTLayoutTypes.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 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/SFNTTypes.pas b/packages/univint/src/SFNTTypes.pas index 160435a7ed..4f8b495406 100644 --- a/packages/univint/src/SFNTTypes.pas +++ b/packages/univint/src/SFNTTypes.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 } @@ -71,6 +71,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} @@ -89,6 +94,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} @@ -99,6 +105,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} @@ -109,6 +116,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} @@ -125,6 +133,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} @@ -135,13 +144,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__ } diff --git a/packages/univint/src/ScalerStreamTypes.pas b/packages/univint/src/ScalerStreamTypes.pas index 83e9ea63ad..01952b8eab 100644 --- a/packages/univint/src/ScalerStreamTypes.pas +++ b/packages/univint/src/ScalerStreamTypes.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/Scrap.pas b/packages/univint/src/Scrap.pas index 0a54d3b501..fe34721daa 100644 --- a/packages/univint/src/Scrap.pas +++ b/packages/univint/src/Scrap.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/Script.pas b/packages/univint/src/Script.pas index bbb55dc58a..67443122ea 100644 --- a/packages/univint/src/Script.pas +++ b/packages/univint/src/Script.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/SecBase.pas b/packages/univint/src/SecBase.pas index 32b1ba20be..336893262f 100644 --- a/packages/univint/src/SecBase.pas +++ b/packages/univint/src/SecBase.pas @@ -76,6 +76,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} @@ -94,6 +99,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} @@ -104,6 +110,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} @@ -114,6 +121,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} @@ -130,6 +138,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} @@ -140,13 +149,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__ } diff --git a/packages/univint/src/SecTrust.pas b/packages/univint/src/SecTrust.pas index 0fb95a9434..abbb1c7b6a 100644 --- a/packages/univint/src/SecTrust.pas +++ b/packages/univint/src/SecTrust.pas @@ -76,6 +76,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} @@ -94,6 +99,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} @@ -104,6 +110,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} @@ -114,6 +121,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} @@ -130,6 +138,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} @@ -140,13 +149,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__ } diff --git a/packages/univint/src/Sound.pas b/packages/univint/src/Sound.pas index bacb744aef..853149d1fb 100644 --- a/packages/univint/src/Sound.pas +++ b/packages/univint/src/Sound.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/SpeechRecognition.pas b/packages/univint/src/SpeechRecognition.pas index 8b2739924d..0ec74a8dde 100644 --- a/packages/univint/src/SpeechRecognition.pas +++ b/packages/univint/src/SpeechRecognition.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/SpeechSynthesis.pas b/packages/univint/src/SpeechSynthesis.pas index deb498349c..257071a756 100644 --- a/packages/univint/src/SpeechSynthesis.pas +++ b/packages/univint/src/SpeechSynthesis.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/StringCompare.pas b/packages/univint/src/StringCompare.pas index 6b7428ab02..2e060e9508 100644 --- a/packages/univint/src/StringCompare.pas +++ b/packages/univint/src/StringCompare.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/SystemConfiguration.pas b/packages/univint/src/SystemConfiguration.pas index 1f184b3ae8..94f8793233 100644 --- a/packages/univint/src/SystemConfiguration.pas +++ b/packages/univint/src/SystemConfiguration.pas @@ -77,6 +77,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} @@ -95,6 +100,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} @@ -105,6 +111,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} @@ -115,6 +122,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} @@ -131,6 +139,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} @@ -141,13 +150,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__ } diff --git a/packages/univint/src/SystemSound.pas b/packages/univint/src/SystemSound.pas index 6e17feee8b..64e5b4bf5e 100644 --- a/packages/univint/src/SystemSound.pas +++ b/packages/univint/src/SystemSound.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Peter N Lewis, <peter@stairways.com.au>, 2005 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/TSMTE.pas b/packages/univint/src/TSMTE.pas index 650a2a92b1..a85f7f54b9 100644 --- a/packages/univint/src/TSMTE.pas +++ b/packages/univint/src/TSMTE.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/TextCommon.pas b/packages/univint/src/TextCommon.pas index 7a980c2b61..6ddca88f0c 100644 --- a/packages/univint/src/TextCommon.pas +++ b/packages/univint/src/TextCommon.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/TextEdit.pas b/packages/univint/src/TextEdit.pas index d84780b382..0385f9f9ba 100644 --- a/packages/univint/src/TextEdit.pas +++ b/packages/univint/src/TextEdit.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/TextEncodingConverter.pas b/packages/univint/src/TextEncodingConverter.pas index 3af082c37a..ce0d9ff190 100644 --- a/packages/univint/src/TextEncodingConverter.pas +++ b/packages/univint/src/TextEncodingConverter.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/TextEncodingPlugin.pas b/packages/univint/src/TextEncodingPlugin.pas index 6c4672576a..dc5d56e53a 100644 --- a/packages/univint/src/TextEncodingPlugin.pas +++ b/packages/univint/src/TextEncodingPlugin.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/TextInputSources.pas b/packages/univint/src/TextInputSources.pas index 31140b1b86..2ed6778b2a 100644 --- a/packages/univint/src/TextInputSources.pas +++ b/packages/univint/src/TextInputSources.pas @@ -8,7 +8,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__ } diff --git a/packages/univint/src/TextServices.pas b/packages/univint/src/TextServices.pas index 902d68eab2..cdd6c4dc3d 100644 --- a/packages/univint/src/TextServices.pas +++ b/packages/univint/src/TextServices.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/TextUtils.pas b/packages/univint/src/TextUtils.pas index 2fef316a95..3cd688aaf4 100644 --- a/packages/univint/src/TextUtils.pas +++ b/packages/univint/src/TextUtils.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/Threads.pas b/packages/univint/src/Threads.pas index 097c0395f9..da878c442a 100644 --- a/packages/univint/src/Threads.pas +++ b/packages/univint/src/Threads.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Timer.pas b/packages/univint/src/Timer.pas index e4bae861ed..f87411182d 100644 --- a/packages/univint/src/Timer.pas +++ b/packages/univint/src/Timer.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } diff --git a/packages/univint/src/ToolUtils.pas b/packages/univint/src/ToolUtils.pas index 54517e50d3..a3de884ee6 100644 --- a/packages/univint/src/ToolUtils.pas +++ b/packages/univint/src/ToolUtils.pas @@ -63,6 +63,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} @@ -81,6 +86,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} @@ -91,6 +97,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} @@ -101,6 +108,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} @@ -117,6 +125,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} @@ -127,13 +136,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__ } diff --git a/packages/univint/src/Translation.pas b/packages/univint/src/Translation.pas index 3aa123260a..c2e1fc5e43 100644 --- a/packages/univint/src/Translation.pas +++ b/packages/univint/src/Translation.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/TranslationExtensions.pas b/packages/univint/src/TranslationExtensions.pas index 6fdb36c754..a93d56d898 100644 --- a/packages/univint/src/TranslationExtensions.pas +++ b/packages/univint/src/TranslationExtensions.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/TranslationServices.pas b/packages/univint/src/TranslationServices.pas index 8cdb16c2f6..622dd9d138 100644 --- a/packages/univint/src/TranslationServices.pas +++ b/packages/univint/src/TranslationServices.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 } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -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__ } diff --git a/packages/univint/src/TypeSelect.pas b/packages/univint/src/TypeSelect.pas index 03b4ca4556..9f438e3b4a 100644 --- a/packages/univint/src/TypeSelect.pas +++ b/packages/univint/src/TypeSelect.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 } { Pascal Translation Updated: Peter N Lewis, <peter@stairways.com.au>, August 2005 } @@ -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__ } diff --git a/packages/univint/src/URLAccess.pas b/packages/univint/src/URLAccess.pas index 4624428271..4b5fd91b18 100644 --- a/packages/univint/src/URLAccess.pas +++ b/packages/univint/src/URLAccess.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/UTCUtils.pas b/packages/univint/src/UTCUtils.pas index 5b9b6810cd..e9749c7e7b 100644 --- a/packages/univint/src/UTCUtils.pas +++ b/packages/univint/src/UTCUtils.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/UTCoreTypes.pas b/packages/univint/src/UTCoreTypes.pas index 8b7eaf6580..1fb3b61dc7 100644 --- a/packages/univint/src/UTCoreTypes.pas +++ b/packages/univint/src/UTCoreTypes.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/UTType.pas b/packages/univint/src/UTType.pas index 99036416ce..e213c59c08 100644 --- a/packages/univint/src/UTType.pas +++ b/packages/univint/src/UTType.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Update: Gorazd Krosl <gorazd_1957@yahoo.ca>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/UnicodeConverter.pas b/packages/univint/src/UnicodeConverter.pas index 222df71181..7b2a374e4d 100644 --- a/packages/univint/src/UnicodeConverter.pas +++ b/packages/univint/src/UnicodeConverter.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/UnicodeUtilities.pas b/packages/univint/src/UnicodeUtilities.pas index a0c6c7ace0..06c63eae74 100644 --- a/packages/univint/src/UnicodeUtilities.pas +++ b/packages/univint/src/UnicodeUtilities.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/UniversalAccess.pas b/packages/univint/src/UniversalAccess.pas index 36ba54b2f1..0cb48ca118 100644 --- a/packages/univint/src/UniversalAccess.pas +++ b/packages/univint/src/UniversalAccess.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 } { Pascal Translation: Gale R Paeper, <gpaeper@empirenet.com>, 2006 } @@ -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__ } diff --git a/packages/univint/src/Video.pas b/packages/univint/src/Video.pas index 8012d2bef7..0d851c2342 100644 --- a/packages/univint/src/Video.pas +++ b/packages/univint/src/Video.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -68,6 +68,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} @@ -86,6 +91,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} @@ -96,6 +102,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} @@ -106,6 +113,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} @@ -122,6 +130,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} @@ -132,13 +141,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__ } diff --git a/packages/univint/src/WSMethodInvocation.pas b/packages/univint/src/WSMethodInvocation.pas index b15a9ffdf0..6b9e38618a 100644 --- a/packages/univint/src/WSMethodInvocation.pas +++ b/packages/univint/src/WSMethodInvocation.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/WSProtocolHandler.pas b/packages/univint/src/WSProtocolHandler.pas index 3aad151e23..cc97661b1f 100644 --- a/packages/univint/src/WSProtocolHandler.pas +++ b/packages/univint/src/WSProtocolHandler.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/WSTypes.pas b/packages/univint/src/WSTypes.pas index 3db024bbfe..8767a3a9f9 100644 --- a/packages/univint/src/WSTypes.pas +++ b/packages/univint/src/WSTypes.pas @@ -8,7 +8,7 @@ Bugs?: For bug reports, consult the following page on the World Wide Web: - http://www.freepascal.org/bugs.html + http://bugs.freepascal.org } { Pascal Translation: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -67,6 +67,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} @@ -85,6 +90,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} @@ -95,6 +101,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} @@ -105,6 +112,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} @@ -121,6 +129,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} @@ -131,13 +140,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__ } diff --git a/packages/univint/src/cblas.pas b/packages/univint/src/cblas.pas index 9079cabd2d..aa8af701e4 100644 --- a/packages/univint/src/cblas.pas +++ b/packages/univint/src/cblas.pas @@ -66,6 +66,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} @@ -84,6 +89,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} @@ -94,6 +100,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} @@ -104,6 +111,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} @@ -120,6 +128,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} @@ -130,13 +139,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__ } diff --git a/packages/univint/src/certextensions.pas b/packages/univint/src/certextensions.pas index bc336ec3b0..de555758e8 100644 --- a/packages/univint/src/certextensions.pas +++ b/packages/univint/src/certextensions.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/cssmapple.pas b/packages/univint/src/cssmapple.pas index 5b2b3bda9a..6457d67279 100644 --- a/packages/univint/src/cssmapple.pas +++ b/packages/univint/src/cssmapple.pas @@ -79,6 +79,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} @@ -97,6 +102,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} @@ -107,6 +113,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} @@ -117,6 +124,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} @@ -133,6 +141,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} @@ -143,13 +152,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__ } @@ -514,7 +536,7 @@ const CSSM_DL_DB_RECORD_EXTENDED_ATTRIBUTE = CSSM_DB_RECORDTYPE_APP_DEFINED_START + $1000 + 4; CSSM_DL_DB_RECORD_METADATA = CSSM_DB_RECORDTYPE_APP_DEFINED_START + $8000; -{ AppleFileDL extensions: passthrough ids } +{ AppleFileDL extentions: passthrough ids } const // Toggle whether or not to autocommit after modifying the database. // The input parameter is a CSSM_BOOL, where TRUE turns autocommit on diff --git a/packages/univint/src/cssmconfig.pas b/packages/univint/src/cssmconfig.pas index 82a2d827f2..202a807f2b 100644 --- a/packages/univint/src/cssmconfig.pas +++ b/packages/univint/src/cssmconfig.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/cssmerr.pas b/packages/univint/src/cssmerr.pas index 71a7cb4b63..290f96c760 100644 --- a/packages/univint/src/cssmerr.pas +++ b/packages/univint/src/cssmerr.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/cssmkrapi.pas b/packages/univint/src/cssmkrapi.pas index 1957f81bc7..ec0fa53f3a 100644 --- a/packages/univint/src/cssmkrapi.pas +++ b/packages/univint/src/cssmkrapi.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/cssmtype.pas b/packages/univint/src/cssmtype.pas index 1583b7ad00..d16ad02820 100644 --- a/packages/univint/src/cssmtype.pas +++ b/packages/univint/src/cssmtype.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/fenv.pas b/packages/univint/src/fenv.pas index 759c09a018..08b26f973e 100644 --- a/packages/univint/src/fenv.pas +++ b/packages/univint/src/fenv.pas @@ -74,6 +74,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} @@ -92,6 +97,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} @@ -102,6 +108,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} @@ -112,6 +119,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} @@ -128,6 +136,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} @@ -138,13 +147,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__ } diff --git a/packages/univint/src/fp.pas b/packages/univint/src/fp.pas index 3a1071d01c..1e13d716d2 100644 --- a/packages/univint/src/fp.pas +++ b/packages/univint/src/fp.pas @@ -62,6 +62,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} @@ -80,6 +85,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} @@ -90,6 +96,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} @@ -100,6 +107,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} @@ -116,6 +124,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} @@ -126,13 +135,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__ } @@ -211,7 +233,7 @@ uses MacTypes,ConditionalMacros; * x86 double(64) double(64) * * * *******************************************************************************} -{$ifc TARGET_CPU_PPC or TARGET_CPU_PPC64 or TARGET_CPU_ARM} +{$ifc TARGET_CPU_PPC or TARGET_CPU_PPC64 or TARGET_CPU_ARM or TARGET_CPU_ARM64} type float_t = Float32; diff --git a/packages/univint/src/gliContexts.pas b/packages/univint/src/gliContexts.pas index 3127bf40bb..3363379347 100644 --- a/packages/univint/src/gliContexts.pas +++ b/packages/univint/src/gliContexts.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/gliDispatch.pas b/packages/univint/src/gliDispatch.pas index fc9601deba..02a2b4c90d 100644 --- a/packages/univint/src/gliDispatch.pas +++ b/packages/univint/src/gliDispatch.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/gluContext.pas b/packages/univint/src/gluContext.pas index 87d7fd507e..ece2f6e01a 100644 --- a/packages/univint/src/gluContext.pas +++ b/packages/univint/src/gluContext.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/kern_return.pas b/packages/univint/src/kern_return.pas index d683777c23..5ae84d9ef2 100644 --- a/packages/univint/src/kern_return.pas +++ b/packages/univint/src/kern_return.pas @@ -80,6 +80,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} @@ -98,6 +103,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 +114,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} @@ -118,6 +125,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} @@ -134,6 +142,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} @@ -144,13 +153,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__ } diff --git a/packages/univint/src/macgl.pas b/packages/univint/src/macgl.pas index 60f5d750ff..b85da1c391 100644 --- a/packages/univint/src/macgl.pas +++ b/packages/univint/src/macgl.pas @@ -54,6 +54,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} @@ -72,6 +77,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} @@ -82,6 +88,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} @@ -92,6 +99,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} @@ -108,6 +116,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} @@ -118,13 +127,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__ } diff --git a/packages/univint/src/macglext.pas b/packages/univint/src/macglext.pas index 3809233629..901aabbb95 100644 --- a/packages/univint/src/macglext.pas +++ b/packages/univint/src/macglext.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/macglu.pas b/packages/univint/src/macglu.pas index e3d77a5608..bcac89b5e7 100644 --- a/packages/univint/src/macglu.pas +++ b/packages/univint/src/macglu.pas @@ -57,6 +57,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} @@ -75,6 +80,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} @@ -85,6 +91,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} @@ -95,6 +102,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} @@ -111,6 +119,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} @@ -121,13 +130,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__ } diff --git a/packages/univint/src/mach_error.pas b/packages/univint/src/mach_error.pas index cbf4bcdf67..a1926f8f71 100644 --- a/packages/univint/src/mach_error.pas +++ b/packages/univint/src/mach_error.pas @@ -80,6 +80,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} @@ -98,6 +103,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 +114,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} @@ -118,6 +125,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} @@ -134,6 +142,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} @@ -144,13 +153,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__ } diff --git a/packages/univint/src/vBLAS.pas b/packages/univint/src/vBLAS.pas index 604efa9abe..2310417f7a 100644 --- a/packages/univint/src/vBLAS.pas +++ b/packages/univint/src/vBLAS.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/vDSP.pas b/packages/univint/src/vDSP.pas index da50e0d403..1eff89fe25 100644 --- a/packages/univint/src/vDSP.pas +++ b/packages/univint/src/vDSP.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 } { Pascal Translation Updated: Jonas Maebe, <jonas@freepascal.org>, October 2009 } @@ -69,6 +69,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} @@ -87,6 +92,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} @@ -97,6 +103,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} @@ -107,6 +114,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} @@ -123,6 +131,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} @@ -133,13 +142,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__ } diff --git a/packages/univint/src/x509defs.pas b/packages/univint/src/x509defs.pas index e1e88dec9d..287858a1b2 100644 --- a/packages/univint/src/x509defs.pas +++ b/packages/univint/src/x509defs.pas @@ -78,6 +78,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} @@ -96,6 +101,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} @@ -106,6 +112,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} @@ -116,6 +123,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} @@ -132,6 +140,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} @@ -142,13 +151,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__ } diff --git a/packages/univint/src/xattr.pas b/packages/univint/src/xattr.pas index f2c06293d8..0db25f413f 100644 --- a/packages/univint/src/xattr.pas +++ b/packages/univint/src/xattr.pas @@ -81,6 +81,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} @@ -99,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} @@ -109,6 +115,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} @@ -119,6 +126,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} @@ -135,6 +143,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} @@ -145,13 +154,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__ } |