diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/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.
diff --git a/MultiSource/Applications/obsequi/CMakeLists.txt b/MultiSource/Applications/obsequi/CMakeLists.txt
--- a/MultiSource/Applications/obsequi/CMakeLists.txt
+++ b/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)
diff --git a/MultiSource/Applications/obsequi/Makefile b/MultiSource/Applications/obsequi/Makefile
--- a/MultiSource/Applications/obsequi/Makefile
+++ b/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