Enable CoreValidation on CM52 with LLVM/Clang 18

ARM-software · Apr 30, 2024 · aa9d8d6 · aa9d8d6
1 parent 6c0d0b2
commit aa9d8d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CMSIS/CoreValidation/Project/build.py b/CMSIS/CoreValidation/Project/build.py
@@ -285,15 +285,18 @@ def qemu_exec(config):
     cmdline += ["-kernel", f"{build_dir(config)}/{output_dir(config)}/Validation.{config.compiler.image_ext}"]
     return cmdline
 
+
 @matrix_filter
 def filter_iar(config):
     return config.compiler == CompilerAxis.IAR
 
+
 @matrix_filter
-def filter_cm52(config):
+def filter_gcc_cm52(config):
     device = config.device.match('CM52*')
-    compiler = config.compiler != CompilerAxis.AC6
+    compiler = config.compiler == CompilerAxis.GCC
     return device and compiler
 
+
 if __name__ == "__main__":
     main()
diff --git a/CMSIS/CoreValidation/Project/vcpkg-configuration.json b/CMSIS/CoreValidation/Project/vcpkg-configuration.json
@@ -2,7 +2,7 @@
     "registries": [
       {
         "kind": "artifact",
-        "location": "https://artifacts.keil.arm.com/vcpkg-ce-registry/registry.zip",
+        "location": "https://artifacts.tools.arm.com/vcpkg-ce-registry/registry.zip",
         "name": "arm"
       }
     ],
@@ -11,7 +11,7 @@
       "arm:ninja": "^1.10.2",
       "arm:compilers/arm/armclang":"^6.22.0",
       "arm:compilers/arm/arm-none-eabi-gcc": "^13.2.1",
-      "arm:compilers/arm/llvm-embedded": "^17.0.1-0",
+      "arm:compilers/arm/llvm-embedded": "^18.1.3",
       "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.1.0-0",
       "arm:models/arm/avh-fvp": "11.22.39",
       "arm:debuggers/arm/armdbg": "^6.0.0"