[libcxx-commits] [PATCH] D98771: [libcxx][Arm] Move buildbot flags into cmake files

[David Spickett via Phabricator via libcxx-commits]

DavidSpickett created this revision.
Herald added subscribers: danielkiss, kristof.beyls, arichardson, mgorny.
DavidSpickett requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D98771

Files:
  libcxx/cmake/caches/Armv7.cmake
  libcxx/cmake/caches/Armv7Arm.cmake
  libcxx/cmake/caches/Armv7Thumb.cmake
  libcxx/cmake/caches/Armv8.cmake
  libcxx/cmake/caches/Armv8Arm.cmake
  libcxx/cmake/caches/Armv8Thumb.cmake
  libcxx/utils/ci/run-buildbot


Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -402,16 +402,12 @@
 # Aka Armv8 32 bit
 armv8)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8.cmake" \
-    -DCMAKE_CXX_FLAGS="-marm" \
-    -DCMAKE_C_FLAGS="-marm"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Arm.cmake"
     check-cxx-cxxabi
 ;;
 armv8-noexceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8.cmake" \
-    -DCMAKE_CXX_FLAGS="-mthumb" \
-    -DCMAKE_C_FLAGS="-mthumb" \
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb.cmake" \
     -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF
     check-cxx-cxxabi
@@ -419,16 +415,12 @@
 # Armv7 32 bit. One building Arm only one Thumb only code.
 armv7)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7.cmake" \
-    -DCMAKE_CXX_FLAGS="-marm" \
-    -DCMAKE_C_FLAGS="-marm"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Arm.cmake"
     check-cxx-cxxabi
 ;;
 armv7-noexceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7.cmake" \
-    -DCMAKE_CXX_FLAGS="-mthumb" \
-    -DCMAKE_C_FLAGS="-mthumb" \
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb.cmake" \
     -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF
     check-cxx-cxxabi
Index: libcxx/cmake/caches/Armv8Thumb.cmake
===================================================================
--- libcxx/cmake/caches/Armv8Thumb.cmake
+++ libcxx/cmake/caches/Armv8Thumb.cmake
@@ -1,2 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
 set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
+set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
+set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
Index: libcxx/cmake/caches/Armv8Arm.cmake
===================================================================
--- libcxx/cmake/caches/Armv8Arm.cmake
+++ libcxx/cmake/caches/Armv8Arm.cmake
@@ -1,2 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
 set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
+set(CMAKE_CXX_FLAGS "-marm" CACHE STRING "")
+set(CMAKE_C_FLAGS "-marm" CACHE STRING "")
Index: libcxx/cmake/caches/Armv7Thumb.cmake
===================================================================
--- libcxx/cmake/caches/Armv7Thumb.cmake
+++ libcxx/cmake/caches/Armv7Thumb.cmake
@@ -1,2 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
 set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
+set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
+set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
Index: libcxx/cmake/caches/Armv7Arm.cmake
===================================================================
--- libcxx/cmake/caches/Armv7Arm.cmake
+++ libcxx/cmake/caches/Armv7Arm.cmake
@@ -1,2 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
 set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
+set(CMAKE_CXX_FLAGS "-marm" CACHE STRING "")
+set(CMAKE_C_FLAGS "-marm" CACHE STRING "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D98771.331216.patch
Type: text/x-patch
Size: 3194 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210317/4430b3d6/attachment.bin>