Skip to content

Commit f939d7b

Browse files
authored
Fix #15066 (platform: rename the arm64 platform files) (#8887)
1 parent 8bb772d commit f939d7b

7 files changed

Lines changed: 64 additions & 3 deletions

File tree

‎platforms/arm64-linux.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<!-- 64-bit ARM Linux (AArch64 LP64 ABI). This describes the default setup. This platform file may also be suitable for bare-metal and RTOS targets (e.g. Zephyr, FreeRTOS) that use the AArch64 LP64 ABI. -->
3+
<platform>
4+
<char_bit>8</char_bit>
5+
<default-sign>unsigned</default-sign>
6+
<sizeof>
7+
<bool>1</bool>
8+
<short>2</short>
9+
<int>4</int>
10+
<long>8</long>
11+
<long-long>8</long-long>
12+
<float>4</float>
13+
<double>8</double>
14+
<long-double>16</long-double>
15+
<pointer>8</pointer>
16+
<size_t>8</size_t>
17+
<wchar_t>4</wchar_t>
18+
</sizeof>
19+
</platform>

‎platforms/arm64-macos.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<!-- 64-bit ARM macOS / Apple Silicon (Apple arm64 LP64 ABI). This describes the default setup. -->
3+
<platform>
4+
<char_bit>8</char_bit>
5+
<default-sign>signed</default-sign>
6+
<sizeof>
7+
<bool>1</bool>
8+
<short>2</short>
9+
<int>4</int>
10+
<long>8</long>
11+
<long-long>8</long-long>
12+
<float>4</float>
13+
<double>8</double>
14+
<long-double>8</long-double>
15+
<pointer>8</pointer>
16+
<size_t>8</size_t>
17+
<wchar_t>4</wchar_t>
18+
</sizeof>
19+
</platform>

‎platforms/arm64-wchar_t2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<double>8</double>
1313
<long-double>8</long-double>
1414
<pointer>8</pointer>
15-
<size_t>4</size_t>
15+
<size_t>8</size_t>
1616
<wchar_t>2</wchar_t>
1717
</sizeof>
1818
</platform>

‎platforms/arm64-wchar_t4.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<double>8</double>
1313
<long-double>8</long-double>
1414
<pointer>8</pointer>
15-
<size_t>4</size_t>
15+
<size_t>8</size_t>
1616
<wchar_t>4</wchar_t>
1717
</sizeof>
1818
</platform>

‎platforms/arm64-windows.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<!-- 64-bit ARM Windows (LLP64 ABI). This describes the default MSVC setup. LLP64 only defines the sizes of int, long, long long and pointers; other properties such as the signedness of char, the size of long double and the size of wchar_t are Windows specific, so a generic arm64 LLP64 platform file would not necessarily be identical to this one. -->
3+
<platform>
4+
<char_bit>8</char_bit>
5+
<default-sign>signed</default-sign>
6+
<sizeof>
7+
<bool>1</bool>
8+
<short>2</short>
9+
<int>4</int>
10+
<long>4</long>
11+
<long-long>8</long-long>
12+
<float>4</float>
13+
<double>8</double>
14+
<long-double>8</long-double>
15+
<pointer>8</pointer>
16+
<size_t>8</size_t>
17+
<wchar_t>2</wchar_t>
18+
</sizeof>
19+
</platform>

‎releasenotes.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Import project:
2020
-
2121

2222
Infrastructure & dependencies:
23-
-
23+
- Added arm64 platform files arm64-windows.xml, arm64-linux.xml and arm64-macos.xml (Apple Silicon).
24+
These describe the default setup for that OS. The arm64-wchar_t2.xml and arm64-wchar_t4.xml files are kept.
2425

2526
Other:
2627
-

‎win_installer/cppcheck.wxs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@
140140
<File Id='aix_ppc64.xml' Name='aix_ppc64.xml' Source='$(var.PtfsDir)\aix_ppc64.xml' />
141141
<File Id='arm32wchar_t2.xml' Name='arm32-wchar_t2.xml' Source='$(var.PtfsDir)\arm32-wchar_t2.xml' />
142142
<File Id='arm32wchar_t4.xml' Name='arm32-wchar_t4.xml' Source='$(var.PtfsDir)\arm32-wchar_t4.xml' />
143+
<File Id='arm64linux.xml' Name='arm64-linux.xml' Source='$(var.PtfsDir)\arm64-linux.xml' />
144+
<File Id='arm64macos.xml' Name='arm64-macos.xml' Source='$(var.PtfsDir)\arm64-macos.xml' />
145+
<File Id='arm64windows.xml' Name='arm64-windows.xml' Source='$(var.PtfsDir)\arm64-windows.xml' />
143146
<File Id='arm64wchar_t2.xml' Name='arm64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-wchar_t2.xml' />
144147
<File Id='arm64wchar_t4.xml' Name='arm64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-wchar_t4.xml' />
145148
<File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />

0 commit comments

Comments
 (0)