From e914f9dfea2778d57c96448ddd96214a924fa0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 24 Sep 2026 13:24:20 +0200
Subject: [PATCH 1/5] Fix #15066 (platform: rename the arm64 platform files)

---
 platforms/{arm64-wchar_t2.xml => arm64-llp64-wchar_t2.xml} | 4 ++--
 platforms/{arm64-wchar_t4.xml => arm64-lp64-wchar_t4.xml}  | 6 +++---
 releasenotes.txt                                           | 3 ++-
 win_installer/cppcheck.wxs                                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename platforms/{arm64-wchar_t2.xml => arm64-llp64-wchar_t2.xml} (83%)
 rename platforms/{arm64-wchar_t4.xml => arm64-lp64-wchar_t4.xml} (80%)

diff --git a/platforms/arm64-wchar_t2.xml b/platforms/arm64-llp64-wchar_t2.xml
similarity index 83%
rename from platforms/arm64-wchar_t2.xml
rename to platforms/arm64-llp64-wchar_t2.xml
index 2b0cff4989f..cc4c2ca00a2 100644
--- a/platforms/arm64-wchar_t2.xml
+++ b/platforms/arm64-llp64-wchar_t2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <platform>
   <char_bit>8</char_bit>
-  <default-sign>unsigned</default-sign>
+  <default-sign>signed</default-sign>
   <sizeof>
     <bool>1</bool>
     <short>2</short>
@@ -12,7 +12,7 @@
     <double>8</double>
     <long-double>8</long-double>
     <pointer>8</pointer>
-    <size_t>4</size_t>
+    <size_t>8</size_t>
     <wchar_t>2</wchar_t>
   </sizeof>
 </platform>
diff --git a/platforms/arm64-wchar_t4.xml b/platforms/arm64-lp64-wchar_t4.xml
similarity index 80%
rename from platforms/arm64-wchar_t4.xml
rename to platforms/arm64-lp64-wchar_t4.xml
index 35183bb089c..818c2841580 100644
--- a/platforms/arm64-wchar_t4.xml
+++ b/platforms/arm64-lp64-wchar_t4.xml
@@ -6,13 +6,13 @@
     <bool>1</bool>
     <short>2</short>
     <int>4</int>
-    <long>4</long>
+    <long>8</long>
     <long-long>8</long-long>
     <float>4</float>
     <double>8</double>
-    <long-double>8</long-double>
+    <long-double>16</long-double>
     <pointer>8</pointer>
-    <size_t>4</size_t>
+    <size_t>8</size_t>
     <wchar_t>4</wchar_t>
   </sizeof>
 </platform>
diff --git a/releasenotes.txt b/releasenotes.txt
index 68b03d2b083..f76dd247287 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -20,7 +20,8 @@ Import project:
 -
 
 Infrastructure & dependencies:
--
+- The platform arm64-wchar_t2.xml was renamed to arm64-llp64-wchar_t2.xml. if you used this platform you can either change your cppcheck command or create a arm64-wchar_t2.xml file.
+- The platform arm64-wchar_t4.xml was renamed to arm64-lp64-wchar_t4.xml. if you used this platform you can either change your cppcheck command or create a arm64-wchar_t4.xml file.
 
 Other:
 -
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 91d08c1c946..863e64793a5 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -140,8 +140,8 @@
               <File Id='aix_ppc64.xml' Name='aix_ppc64.xml' Source='$(var.PtfsDir)\aix_ppc64.xml' />
               <File Id='arm32wchar_t2.xml' Name='arm32-wchar_t2.xml' Source='$(var.PtfsDir)\arm32-wchar_t2.xml' />
               <File Id='arm32wchar_t4.xml' Name='arm32-wchar_t4.xml' Source='$(var.PtfsDir)\arm32-wchar_t4.xml' />
-              <File Id='arm64wchar_t2.xml' Name='arm64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-wchar_t2.xml' />
-              <File Id='arm64wchar_t4.xml' Name='arm64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-wchar_t4.xml' />
+              <File Id='arm64llp64wchar_t2.xml' Name='arm64-llp64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-llp64-wchar_t2.xml' />
+              <File Id='arm64lp64wchar_t4.xml' Name='arm64-lp64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-lp64-wchar_t4.xml' />
               <File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />
               <File Id='elbrus_e1cp.xml' Name='elbrus-e1cp.xml' Source='$(var.PtfsDir)\elbrus-e1cp.xml' />
               <File Id='pic8.xml' Name='pic8.xml' Source='$(var.PtfsDir)\pic8.xml' />

From 3f83b5f21042c0075560baf3a076d72be1c4dec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@cppcheck.com>
Date: Thu, 24 Sep 2026 20:51:11 +0200
Subject: [PATCH 2/5] rename

---
 ...rm64-lp64-wchar_t4.xml => arm64-linux.xml} |  1 +
 ...m64-llp64-wchar_t2.xml => arm64-macos.xml} |  5 +++--
 platforms/arm64-windows.xml                   | 19 +++++++++++++++++++
 releasenotes.txt                              |  8 ++++++--
 win_installer/cppcheck.wxs                    |  5 +++--
 5 files changed, 32 insertions(+), 6 deletions(-)
 rename platforms/{arm64-lp64-wchar_t4.xml => arm64-linux.xml} (80%)
 rename platforms/{arm64-llp64-wchar_t2.xml => arm64-macos.xml} (70%)
 create mode 100644 platforms/arm64-windows.xml

diff --git a/platforms/arm64-lp64-wchar_t4.xml b/platforms/arm64-linux.xml
similarity index 80%
rename from platforms/arm64-lp64-wchar_t4.xml
rename to platforms/arm64-linux.xml
index 818c2841580..d184a7ea6a5 100644
--- a/platforms/arm64-lp64-wchar_t4.xml
+++ b/platforms/arm64-linux.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- 64-bit ARM Linux (AArch64 LP64 ABI), GCC and Clang. This describes the default setup. -->
 <platform>
   <char_bit>8</char_bit>
   <default-sign>unsigned</default-sign>
diff --git a/platforms/arm64-llp64-wchar_t2.xml b/platforms/arm64-macos.xml
similarity index 70%
rename from platforms/arm64-llp64-wchar_t2.xml
rename to platforms/arm64-macos.xml
index cc4c2ca00a2..b5713159d2d 100644
--- a/platforms/arm64-llp64-wchar_t2.xml
+++ b/platforms/arm64-macos.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- 64-bit ARM macOS / Apple Silicon (Apple arm64 LP64 ABI). This describes the default setup. -->
 <platform>
   <char_bit>8</char_bit>
   <default-sign>signed</default-sign>
@@ -6,13 +7,13 @@
     <bool>1</bool>
     <short>2</short>
     <int>4</int>
-    <long>4</long>
+    <long>8</long>
     <long-long>8</long-long>
     <float>4</float>
     <double>8</double>
     <long-double>8</long-double>
     <pointer>8</pointer>
     <size_t>8</size_t>
-    <wchar_t>2</wchar_t>
+    <wchar_t>4</wchar_t>
   </sizeof>
 </platform>
diff --git a/platforms/arm64-windows.xml b/platforms/arm64-windows.xml
new file mode 100644
index 00000000000..f1ea3f39daf
--- /dev/null
+++ b/platforms/arm64-windows.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- 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. -->
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>signed</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>8</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>2</wchar_t>
+  </sizeof>
+</platform>
diff --git a/releasenotes.txt b/releasenotes.txt
index f76dd247287..c2569e519b6 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -20,8 +20,12 @@ Import project:
 -
 
 Infrastructure & dependencies:
-- The platform arm64-wchar_t2.xml was renamed to arm64-llp64-wchar_t2.xml. if you used this platform you can either change your cppcheck command or create a arm64-wchar_t2.xml file.
-- The platform arm64-wchar_t4.xml was renamed to arm64-lp64-wchar_t4.xml. if you used this platform you can either change your cppcheck command or create a arm64-wchar_t4.xml file.
+- arm64 platform files:
+  - arm64-wchar_t2.xml was renamed to arm64-windows.xml.
+  - arm64-wchar_t4.xml was renamed to arm64-linux.xml.
+  - Added arm64 platform file arm64-macos.xml (Apple Silicon).
+  - The arm64 platform files describe the default setup for that OS.
+  - If you have used the old arm64-* files and can't change your cppcheck command, you can copy the old platform files.
 
 Other:
 -
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 863e64793a5..67dca83f34f 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -140,8 +140,9 @@
               <File Id='aix_ppc64.xml' Name='aix_ppc64.xml' Source='$(var.PtfsDir)\aix_ppc64.xml' />
               <File Id='arm32wchar_t2.xml' Name='arm32-wchar_t2.xml' Source='$(var.PtfsDir)\arm32-wchar_t2.xml' />
               <File Id='arm32wchar_t4.xml' Name='arm32-wchar_t4.xml' Source='$(var.PtfsDir)\arm32-wchar_t4.xml' />
-              <File Id='arm64llp64wchar_t2.xml' Name='arm64-llp64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-llp64-wchar_t2.xml' />
-              <File Id='arm64lp64wchar_t4.xml' Name='arm64-lp64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-lp64-wchar_t4.xml' />
+              <File Id='arm64linux.xml' Name='arm64-linux.xml' Source='$(var.PtfsDir)\arm64-linux.xml' />
+              <File Id='arm64macos.xml' Name='arm64-macos.xml' Source='$(var.PtfsDir)\arm64-macos.xml' />
+              <File Id='arm64windows.xml' Name='arm64-windows.xml' Source='$(var.PtfsDir)\arm64-windows.xml' />
               <File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />
               <File Id='elbrus_e1cp.xml' Name='elbrus-e1cp.xml' Source='$(var.PtfsDir)\elbrus-e1cp.xml' />
               <File Id='pic8.xml' Name='pic8.xml' Source='$(var.PtfsDir)\pic8.xml' />

From 90fc6c24848c071ee55afab817c2b02f9c705c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@cppcheck.com>
Date: Fri, 25 Sep 2026 08:51:10 +0200
Subject: [PATCH 3/5] fix

---
 platforms/arm64-linux.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/arm64-linux.xml b/platforms/arm64-linux.xml
index d184a7ea6a5..1e934fffedb 100644
--- a/platforms/arm64-linux.xml
+++ b/platforms/arm64-linux.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 64-bit ARM Linux (AArch64 LP64 ABI), GCC and Clang. This describes the default setup. -->
+<!-- 64-bit ARM Linux (AArch64 LP64 ABI). This describes the default setup. -->
 <platform>
   <char_bit>8</char_bit>
   <default-sign>unsigned</default-sign>

From e3399259ca72b0d35815a0c107ef8995edb1fa6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 25 Sep 2026 11:00:30 +0200
Subject: [PATCH 4/5] Keep arm64-wchar_t2.xml and arm64-wchar_t4.xml platform
 files

Set size_t size to 8 in arm64-wchar_t2.xml and arm64-wchar_t4.xml
---
 platforms/arm64-wchar_t2.xml | 18 ++++++++++++++++++
 platforms/arm64-wchar_t4.xml | 18 ++++++++++++++++++
 releasenotes.txt             |  8 ++------
 win_installer/cppcheck.wxs   |  2 ++
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 platforms/arm64-wchar_t2.xml
 create mode 100644 platforms/arm64-wchar_t4.xml

diff --git a/platforms/arm64-wchar_t2.xml b/platforms/arm64-wchar_t2.xml
new file mode 100644
index 00000000000..32d17d926d2
--- /dev/null
+++ b/platforms/arm64-wchar_t2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>8</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>2</wchar_t>
+  </sizeof>
+</platform>
diff --git a/platforms/arm64-wchar_t4.xml b/platforms/arm64-wchar_t4.xml
new file mode 100644
index 00000000000..6842ff977df
--- /dev/null
+++ b/platforms/arm64-wchar_t4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>4</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>8</double>
+    <long-double>8</long-double>
+    <pointer>8</pointer>
+    <size_t>8</size_t>
+    <wchar_t>4</wchar_t>
+  </sizeof>
+</platform>
diff --git a/releasenotes.txt b/releasenotes.txt
index c2569e519b6..33fd4106800 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -20,12 +20,8 @@ Import project:
 -
 
 Infrastructure & dependencies:
-- arm64 platform files:
-  - arm64-wchar_t2.xml was renamed to arm64-windows.xml.
-  - arm64-wchar_t4.xml was renamed to arm64-linux.xml.
-  - Added arm64 platform file arm64-macos.xml (Apple Silicon).
-  - The arm64 platform files describe the default setup for that OS.
-  - If you have used the old arm64-* files and can't change your cppcheck command, you can copy the old platform files.
+- Added arm64 platform files arm64-windows.xml, arm64-linux.xml and arm64-macos.xml (Apple Silicon).
+  These describe the default setup for that OS. The arm64-wchar_t2.xml and arm64-wchar_t4.xml files are kept.
 
 Other:
 -
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 67dca83f34f..fe59fd6ea06 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -143,6 +143,8 @@
               <File Id='arm64linux.xml' Name='arm64-linux.xml' Source='$(var.PtfsDir)\arm64-linux.xml' />
               <File Id='arm64macos.xml' Name='arm64-macos.xml' Source='$(var.PtfsDir)\arm64-macos.xml' />
               <File Id='arm64windows.xml' Name='arm64-windows.xml' Source='$(var.PtfsDir)\arm64-windows.xml' />
+              <File Id='arm64wchar_t2.xml' Name='arm64-wchar_t2.xml' Source='$(var.PtfsDir)\arm64-wchar_t2.xml' />
+              <File Id='arm64wchar_t4.xml' Name='arm64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-wchar_t4.xml' />
               <File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />
               <File Id='elbrus_e1cp.xml' Name='elbrus-e1cp.xml' Source='$(var.PtfsDir)\elbrus-e1cp.xml' />
               <File Id='pic8.xml' Name='pic8.xml' Source='$(var.PtfsDir)\pic8.xml' />

From 301e871af4bd863646a0d61bbb142bc28830f410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 25 Sep 2026 11:10:23 +0200
Subject: [PATCH 5/5] Mention bare-metal and RTOS targets in arm64-linux.xml
 comment

---
 platforms/arm64-linux.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/arm64-linux.xml b/platforms/arm64-linux.xml
index 1e934fffedb..d8b6a4e7cf6 100644
--- a/platforms/arm64-linux.xml
+++ b/platforms/arm64-linux.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 64-bit ARM Linux (AArch64 LP64 ABI). This describes the default setup. -->
+<!-- 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. -->
 <platform>
   <char_bit>8</char_bit>
   <default-sign>unsigned</default-sign>