[PATCH] D107863: Remove TEST_SUITE_CXX_ABI option
Matthias Braun via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 12 16:23:35 PDT 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rTe148d26e7303: Remove unnecessary TEST_SUITE_CXX_ABI (authored by MatzeB).
Repository:
rT test-suite
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D107863/new/
https://reviews.llvm.org/D107863
Files:
CMakeLists.txt
MultiSource/Applications/obsequi/CMakeLists.txt
MultiSource/Applications/obsequi/Makefile
Index: MultiSource/Applications/obsequi/Makefile
===================================================================
--- MultiSource/Applications/obsequi/Makefile
+++ MultiSource/Applications/obsequi/Makefile
@@ -9,10 +9,5 @@
CPPFLAGS += -DHASHCODEBITS=23
endif
-ifeq (,$(filter $(ARCH),PowerPC Mips))
-LDFLAGS = -lsupc++
-LIBS += -lsupc++
-endif
-
STDIN_FILENAME=$(PROJ_SRC_DIR)/input
include ../../Makefile.multisrc
Index: MultiSource/Applications/obsequi/CMakeLists.txt
===================================================================
--- MultiSource/Applications/obsequi/CMakeLists.txt
+++ MultiSource/Applications/obsequi/CMakeLists.txt
@@ -5,9 +5,6 @@
else()
list(APPEND CPPFLAGS -DHASHCODEBITS=23)
endif()
-if(NOT "${ARCH}" STREQUAL "PowerPC")
- list(APPEND LDFLAGS -l${TEST_SUITE_CXX_ABI_LIBNAME})
-endif()
set(RUN_OPTIONS < input)
llvm_multisource(Obsequi)
llvm_test_data(Obsequi input)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -224,21 +224,6 @@
endif()
endif()
-# This is either directly the C++ ABI library or the full C++ library
-# which pulls in the ABI transitively.
-set(TEST_SUITE_CXX_ABI "default" CACHE STRING "Specify C++ ABI library to use.")
-set(CXXABIS "none default libstdc++ libsupc++ libc++ libc++abi")
-set_property(CACHE TEST_SUITE_CXX_ABI PROPERTY STRINGS "${CXXABIS}")
-if (TEST_SUITE_CXX_ABI STREQUAL "default")
- if (APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Fuchsia")
- set(TEST_SUITE_CXX_ABI_LIBNAME "c++abi")
- else()
- set(TEST_SUITE_CXX_ABI_LIBNAME "supc++")
- endif()
-else()
- STRING(REGEX REPLACE "^lib" "" TEST_SUITE_CXX_ABI_LIBNAME ${TEST_SUITE_CXX_ABI})
-endif()
-
include(TestSuite)
include(SingleMultiSource)
# Needs by External/sollve_vv.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107863.366145.patch
Type: text/x-patch
Size: 1815 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210812/3feb7ac6/attachment.bin>
More information about the llvm-commits
mailing list