Hi,
Using the same method as given in the commit log for r192074 (see
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130930/090302.html),
I have attached a patch that removes duplicated
symbols in libc++ when linked against libsupc++.
I've tested building libc++ against libsupc++, libstdc++ and libc++abi without
any obvious problems, but I wanted to see if anyone has any objections before
I commit it.
Thanks
Andy
Index: projects/libcxx/src/new.cpp
==================================================================
--- projects/libcxx/src/new.cpp
+++ projects/libcxx/src/new.cpp
@@ -193,10 +193,12 @@
#endif // !__GLIBCXX__
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
+
+#ifndef __GLIBCXX__
bad_array_new_length::~bad_array_new_length() _NOEXCEPT
{
}
@@ -204,25 +206,31 @@
bad_array_new_length::what() const _NOEXCEPT
{
return "bad_array_new_length";
}
+#endif // !__GLIBCXX__
+
#endif //LIBCXXRT
+
+bad_array_length::bad_array_length() _NOEXCEPT
+{
+}
+
+#ifndef __GLIBCXX__
+
+bad_array_length::~bad_array_length() _NOEXCEPT
+{
+}
const char*
bad_array_length::what() const _NOEXCEPT
{
return "bad_array_length";
}
-bad_array_length::bad_array_length() _NOEXCEPT
-{
-}
-
-bad_array_length::~bad_array_length() _NOEXCEPT
-{
-}
+#endif // !__GLIBCXX__
#endif // _LIBCPPABI_VERSION
#ifndef LIBSTDCXX
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
