Skip to content

Commit 569b773

Browse files
DavidSpicketttstellar
authored andcommitted
[libcxx][CI] Set Arm triples to match native clang build's default
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) The UNSUPPORTED does not include aarch64 because aarch64 Linux (and others that follow Arm's AAPCS64) use quad precision for long double where arm64 (darwin) does not: https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms https://github.com/ARM-software/abi-aa/blob/main/aapcs64/aapcs64.rst#811arithmetic-types Reviewed By: rovka Differential Revision: https://reviews.llvm.org/D119948
1 parent f7007c5 commit 569b773

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

libcxx/cmake/caches/Armv7Arm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
2-
set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
2+
set(LIBCXX_TARGET_TRIPLE "armv7l-linux-gnueabihf" CACHE STRING "")
33
set(CMAKE_CXX_FLAGS "-marm" CACHE STRING "")
44
set(CMAKE_C_FLAGS "-marm" CACHE STRING "")

libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
2-
set(LIBCXX_TARGET_TRIPLE "armv7-linux-gnueabihf" CACHE STRING "")
2+
set(LIBCXX_TARGET_TRIPLE "armv7l-linux-gnueabihf" CACHE STRING "")
33
set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
44
set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
55
set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")

libcxx/cmake/caches/Armv8Arm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
2-
set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
2+
set(LIBCXX_TARGET_TRIPLE "armv8l-linux-gnueabihf" CACHE STRING "")
33
set(CMAKE_CXX_FLAGS "-marm" CACHE STRING "")
44
set(CMAKE_C_FLAGS "-marm" CACHE STRING "")

libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
2-
set(LIBCXX_TARGET_TRIPLE "armv8-linux-gnueabihf" CACHE STRING "")
2+
set(LIBCXX_TARGET_TRIPLE "armv8l-linux-gnueabihf" CACHE STRING "")
33
set(CMAKE_CXX_FLAGS "-mthumb" CACHE STRING "")
44
set(CMAKE_C_FLAGS "-mthumb" CACHE STRING "")
55
set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")

libcxx/test/std/language.support/cmp/cmp.alg/strong_order_long_double.verify.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
// UNSUPPORTED: libcpp-no-concepts
1111

1212
// The following platforms have sizeof(long double) == sizeof(double), so this test doesn't apply to them.
13-
// UNSUPPORTED: target={{arm64|armv8|armv7|armv7m|powerpc|powerpc64}}-{{.+}}
13+
// This test does apply to aarch64 where Arm's AAPCS64 is followed. There they are different sizes.
14+
// UNSUPPORTED: target={{arm64|armv(7|8)(l|m)?|powerpc|powerpc64}}-{{.+}}
1415
// UNSUPPORTED: target=x86_64-pc-windows-{{.+}}
1516

1617
// <compare>

0 commit comments

Comments
 (0)