[libcxx-commits] [PATCH] D119948: [libcxx][CI] Set Arm triples to match native clang build's default

[David Spickett via Phabricator via libcxx-commits]

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

We were using:
armv8-linux-gnueabihf
But for a native clang build the default target is:
armv8l-linux-gnueabihf

(ditto for v7)

Add the "l" to the target triples and update the one test
that is unsupported to look for the various possible names.

armv(7 or 8)(m or l, optionally)


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D119948

Files:
  libcxx/cmake/caches/Armv7Arm.cmake
  libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
  libcxx/cmake/caches/Armv8Arm.cmake
  libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
  libcxx/test/std/language.support/cmp/cmp.alg/strong_order_long_double.verify.cpp


Index: libcxx/test/std/language.support/cmp/cmp.alg/strong_order_long_double.verify.cpp
===================================================================
--- libcxx/test/std/language.support/cmp/cmp.alg/strong_order_long_double.verify.cpp
+++ libcxx/test/std/language.support/cmp/cmp.alg/strong_order_long_double.verify.cpp
@@ -10,7 +10,7 @@
 // UNSUPPORTED: libcpp-no-concepts
 
 // The following platforms have sizeof(long double) == sizeof(double), so this test doesn't apply to them.
-// UNSUPPORTED: target={{arm64|armv8|armv7|armv7m|powerpc|powerpc64}}-{{.+}}
+// UNSUPPORTED: target={{arm64|armv(7|8)(l|m)?|powerpc|powerpc64}}-{{.+}}
 // UNSUPPORTED: target=x86_64-pc-windows-{{.+}}
 
 // <compare>
Index: libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
===================================================================
--- libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
+++ libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
@@ -1,5 +1,5 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
-set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
+set(LIBCXX_TARGET_TRIPLE "armv8l-linux-gnueabihf" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
 set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
 set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
Index: libcxx/cmake/caches/Armv8Arm.cmake
===================================================================
--- libcxx/cmake/caches/Armv8Arm.cmake
+++ libcxx/cmake/caches/Armv8Arm.cmake
@@ -1,4 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
-set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
+set(LIBCXX_TARGET_TRIPLE "armv8l-linux-gnueabihf" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-marm" CACHE STRING "")
 set(CMAKE_C_FLAGS "-marm" CACHE STRING "")
Index: libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
===================================================================
--- libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
+++ libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
@@ -1,5 +1,5 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
-set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
+set(LIBCXX_TARGET_TRIPLE "armv7l-linux-gnueabihf" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
 set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
 set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
Index: libcxx/cmake/caches/Armv7Arm.cmake
===================================================================
--- libcxx/cmake/caches/Armv7Arm.cmake
+++ libcxx/cmake/caches/Armv7Arm.cmake
@@ -1,4 +1,4 @@
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
-set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
+set(LIBCXX_TARGET_TRIPLE "armv7l-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: D119948.409263.patch
Type: text/x-patch
Size: 2824 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220216/e576e6f4/attachment-0001.bin>