Rename TU names to not conflict with libc++.

In order to easily merge libc++ and libc++abi static archives it's important
that none of the source files share the same name.
(See http://stackoverflow.com/questions/3821916/how-to-merge-two-ar-static-libraries-into-one)

This patch renames source files which share a name with libc++ sources.

llvm-svn: 287327

diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index e6bd381..efbea67 100644 (file)
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Get sources
 set(LIBCXXABI_SOURCES
-  abort_message.cpp
+  # C++ABI files
   cxa_aux_runtime.cpp
   cxa_default_handlers.cpp
   cxa_demangle.cpp
@@ -11,11 +11,14 @@ set(LIBCXXABI_SOURCES
   cxa_unexpected.cpp
   cxa_vector.cpp
   cxa_virtual.cpp
-  exception.cpp
+  # C++ STL files
+  stdlib_exception.cpp
+  stdlib_stdexcept.cpp
+  stdlib_typeinfo.cpp
+  # Internal files
+  abort_message.cpp
   fallback_malloc.cpp
   private_typeinfo.cpp
-  stdexcept.cpp
-  typeinfo.cpp
 )
 
 if (LIBCXXABI_ENABLE_EXCEPTIONS)

diff --git a/libcxxabi/src/exception.cpp b/libcxxabi/src/stdlib_exception.cpp
similarity index 100%
rename from libcxxabi/src/exception.cpp
rename to libcxxabi/src/stdlib_exception.cpp

diff --git a/libcxxabi/src/stdexcept.cpp b/libcxxabi/src/stdlib_stdexcept.cpp
similarity index 100%
rename from libcxxabi/src/stdexcept.cpp
rename to libcxxabi/src/stdlib_stdexcept.cpp

diff --git a/libcxxabi/src/typeinfo.cpp b/libcxxabi/src/stdlib_typeinfo.cpp
similarity index 100%
rename from libcxxabi/src/typeinfo.cpp
rename to libcxxabi/src/stdlib_typeinfo.cpp