diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-20 00:57:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-20 00:57:08 +0000 |
| commit | b26ed3924f0f2bd6c7f1109c637064c9785e0485 (patch) | |
| tree | 4b523df0a5adbcc5bd7d2c698f54a10a5df8877c /libcxx | |
| parent | 568027aabb0ed54c5b07e3020df120875b7c4894 (diff) | |
| download | llvm-b26ed3924f0f2bd6c7f1109c637064c9785e0485.tar.gz | |
Fix handling of Apple target triple when checking the ABI lists.
The check-cxx-abilist rule uses TARGET_TRIPLE to determine which
ABI list to check. However the triple on Apple contains the darwin
version which changes frequently, but libc++ doesn't need
different ABI lists for each darwin version.
This patch strips the minor version and patchlevel from TARGET_TRIPLE
before using it to determine the ABI list.
llvm-svn: 292557
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/lib/abi/3.9/x86_64-apple-darwin16.abilist (renamed from libcxx/lib/abi/3.9/x86_64-apple-darwin16.0.abilist) | 0 | ||||
| -rw-r--r-- | libcxx/lib/abi/4.0/x86_64-apple-darwin16.abilist (renamed from libcxx/lib/abi/4.0/x86_64-apple-darwin16.0.0.abilist) | 0 | ||||
| -rw-r--r-- | libcxx/lib/abi/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | libcxx/lib/abi/x86_64-apple-darwin16.abilist (renamed from libcxx/lib/abi/x86_64-apple-darwin16.0.0.abilist) | 0 |
4 files changed, 10 insertions, 3 deletions
diff --git a/libcxx/lib/abi/3.9/x86_64-apple-darwin16.0.abilist b/libcxx/lib/abi/3.9/x86_64-apple-darwin16.abilist index ea361e9fc44b..ea361e9fc44b 100644 --- a/libcxx/lib/abi/3.9/x86_64-apple-darwin16.0.abilist +++ b/libcxx/lib/abi/3.9/x86_64-apple-darwin16.abilist diff --git a/libcxx/lib/abi/4.0/x86_64-apple-darwin16.0.0.abilist b/libcxx/lib/abi/4.0/x86_64-apple-darwin16.abilist index f7218a45fbb6..f7218a45fbb6 100644 --- a/libcxx/lib/abi/4.0/x86_64-apple-darwin16.0.0.abilist +++ b/libcxx/lib/abi/4.0/x86_64-apple-darwin16.abilist diff --git a/libcxx/lib/abi/CMakeLists.txt b/libcxx/lib/abi/CMakeLists.txt index 41240d72e0ba..464643c70a9e 100644 --- a/libcxx/lib/abi/CMakeLists.txt +++ b/libcxx/lib/abi/CMakeLists.txt @@ -1,8 +1,15 @@ +if (DEFINED TARGET_TRIPLE) + # Ignore the minor and patchlevel versions of the darwin + # target. + string(REGEX REPLACE "darwin16\\.[0-9]\\.[0-9]" "darwin16" + GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}") +endif() + # Detect if we are building in the same configuration used to generate # the abilist files. -if (DEFINED TARGET_TRIPLE - AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/${TARGET_TRIPLE}.abilist" +if (DEFINED GENERIC_TARGET_TRIPLE + AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/${GENERIC_TARGET_TRIPLE}.abilist" AND TARGET cxx_shared AND ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi" OR (APPLE AND "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "default")) @@ -19,7 +26,7 @@ endif() if (LIBCXX_HAS_ABILIST_CONFIGURATION) - set(ABILIST_FILE "${CMAKE_CURRENT_LIST_DIR}/${TARGET_TRIPLE}.abilist") + set(ABILIST_FILE "${CMAKE_CURRENT_LIST_DIR}/${GENERIC_TARGET_TRIPLE}.abilist") set(SYMDIFF_EXE "${LIBCXX_SOURCE_DIR}/utils/sym_check/sym_diff.py") add_custom_target(check-cxx-abilist ${SYMDIFF_EXE} --only-stdlib-symbols --strict ${ABILIST_FILE} diff --git a/libcxx/lib/abi/x86_64-apple-darwin16.0.0.abilist b/libcxx/lib/abi/x86_64-apple-darwin16.abilist index f7218a45fbb6..f7218a45fbb6 100644 --- a/libcxx/lib/abi/x86_64-apple-darwin16.0.0.abilist +++ b/libcxx/lib/abi/x86_64-apple-darwin16.abilist |