[clang] a2855f5 - [CMake][Fuchsia] Use standard spelling for Arm baremetal targets (#101302)

via cfe-commits cfe-commits at lists.llvm.org
Thu Aug 1 22:22:19 PDT 2024


Author: Petr Hosek
Date: 2024-08-01T22:22:16-07:00
New Revision: a2855f51208cd9596b94003e3bf6836b2a7d5971

URL: https://github.com/llvm/llvm-project/commit/a2855f51208cd9596b94003e3bf6836b2a7d5971
DIFF: https://github.com/llvm/llvm-project/commit/a2855f51208cd9596b94003e3bf6836b2a7d5971.diff

LOG: [CMake][Fuchsia] Use standard spelling for Arm baremetal targets (#101302)

It's more common to use `none` rather than `unknown` for the OS
component in Arm baremetal targets.

Added: 
    

Modified: 
    clang/cmake/caches/Fuchsia-stage2.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 75ceb799352f9..7d05940f0d092 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -300,7 +300,7 @@ if(FUCHSIA_SDK)
   set(LLVM_RUNTIME_MULTILIB_hwasan+noexcept_TARGETS "aarch64-unknown-fuchsia;riscv64-unknown-fuchsia" CACHE STRING "")
 endif()
 
-foreach(target armv6m-unknown-eabi;armv7m-unknown-eabi;armv8m.main-unknown-eabi)
+foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
   list(APPEND BUILTIN_TARGETS "${target}")
   set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Generic CACHE STRING "")
   set(BUILTINS_${target}_CMAKE_SYSTEM_PROCESSOR arm CACHE STRING "")
@@ -308,7 +308,7 @@ foreach(target armv6m-unknown-eabi;armv7m-unknown-eabi;armv8m.main-unknown-eabi)
   set(BUILTINS_${target}_CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
   foreach(lang C;CXX;ASM)
     set(BUILTINS_${target}_CMAKE_${lang}_local_flags "--target=${target} -mthumb")
-    if(${target} STREQUAL "armv8m.main-unknown-eabi")
+    if(${target} STREQUAL "armv8m.main-none-eabi")
       set(BUILTINS_${target}_CMAKE_${lang}_local_flags "${BUILTINS_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
     endif()
     set(BUILTINS_${target}_CMAKE_${lang}_FLAGS "${BUILTINS_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")


        


More information about the cfe-commits mailing list