https://github.com/petrhosek updated
https://github.com/llvm/llvm-project/pull/116420
>From 028021ded3dee3f55ba26540f5c9cf1a1e8cbb36 Mon Sep 17 00:00:00 2001
From: Petr Hosek <pho...@google.com>
Date: Tue, 12 Nov 2024 19:50:46 +0000
Subject: [PATCH 1/2] [Fuchsia] Include runtimes for armv8.1m.main-none-eabi
These are needed by some of our users.
---
clang/cmake/caches/Fuchsia-stage2.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake
b/clang/cmake/caches/Fuchsia-stage2.cmake
index 5af98c7b3b3fba..b03df4697e7e20 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -302,7 +302,7 @@ if(FUCHSIA_SDK)
set(LLVM_RUNTIME_MULTILIB_hwasan+noexcept_TARGETS
"aarch64-unknown-fuchsia;riscv64-unknown-fuchsia" CACHE STRING "")
endif()
-foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
+foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.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 "")
@@ -313,6 +313,9 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-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()
+ if(${target} STREQUAL "armv8.1m.main-none-eabi")
+ set(BUILTINS_${target}_CMAKE_${lang}_local_flags
"${BUILTINS_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp -mcpu=cortex-m55" CACHE STRING "")
+ endif()
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS
"${BUILTINS_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
endforeach()
foreach(type SHARED;MODULE;EXE)
@@ -333,6 +336,9 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
if(${target} STREQUAL "armv8m.main-none-eabi")
set(RUNTIMES_${target}_CMAKE_${lang}_local_flags
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=softfp
-march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
endif()
+ if(${target} STREQUAL "armv8.1m.main-none-eabi")
+ set(RUNTIMES_${target}_CMAKE_${lang}_local_flags
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp -mcpu=cortex-m55" CACHE STRING "")
+ endif()
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
endforeach()
foreach(type SHARED;MODULE;EXE)
>From 3d396086fe05a4a26cb5afde73fd8d80b37cc050 Mon Sep 17 00:00:00 2001
From: Petr Hosek <pho...@google.com>
Date: Fri, 15 Nov 2024 19:24:36 +0000
Subject: [PATCH 2/2] Include `+fp.dp`
---
clang/cmake/caches/Fuchsia-stage2.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake
b/clang/cmake/caches/Fuchsia-stage2.cmake
index b03df4697e7e20..747d9974828984 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -314,7 +314,7 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
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()
if(${target} STREQUAL "armv8.1m.main-none-eabi")
- set(BUILTINS_${target}_CMAKE_${lang}_local_flags
"${BUILTINS_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp -mcpu=cortex-m55" CACHE STRING "")
+ set(BUILTINS_${target}_CMAKE_${lang}_local_flags
"${BUILTINS_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "")
endif()
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS
"${BUILTINS_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
endforeach()
@@ -337,7 +337,7 @@ foreach(target
armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi;armv8.1m.
set(RUNTIMES_${target}_CMAKE_${lang}_local_flags
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=softfp
-march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
endif()
if(${target} STREQUAL "armv8.1m.main-none-eabi")
- set(RUNTIMES_${target}_CMAKE_${lang}_local_flags
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp -mcpu=cortex-m55" CACHE STRING "")
+ set(RUNTIMES_${target}_CMAKE_${lang}_local_flags
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard
-march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55" CACHE STRING "")
endif()
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS
"${RUNTIMES_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
endforeach()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
