Cleanup libcxxrt import

commit_hash:a45aa7528cf49e9f590ceddf8b5dd43f8856e327
yandex · Jan 31, 2025 · bb9a7a5 · bb9a7a5
1 parent a8e68bb
commit bb9a7a5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 32 deletions.
diff --git a/contrib/libs/cxxsupp/libcxxrt/cxxabi.h b/contrib/libs/cxxsupp/libcxxrt/cxxabi.h
@@ -41,7 +41,7 @@ namespace std
 
 #ifdef __cplusplus
 #if __cplusplus < 201103L
-#define _LIBCXXRT_NOEXCEPT noexcept
+#define _LIBCXXRT_NOEXCEPT throw()
 #else
 #define _LIBCXXRT_NOEXCEPT noexcept
 #endif

diff --git a/contrib/libs/cxxsupp/libcxxrt/exception.cc b/contrib/libs/cxxsupp/libcxxrt/exception.cc
@@ -35,7 +35,7 @@
 #include "dwarf_eh.h"
 #include "atomic.h"
 #include "cxxabi.h"
-#include "msan.h"
+#include <sanitizer/msan_interface.h>
 
 using namespace ABI_NAMESPACE;
 

diff --git a/contrib/libs/cxxsupp/libcxxrt/msan.h b/contrib/libs/cxxsupp/libcxxrt/msan.h
diff --git a/contrib/libs/cxxsupp/libcxxrt/stdexcept.cc b/contrib/libs/cxxsupp/libcxxrt/stdexcept.cc
@@ -32,7 +32,7 @@
 namespace std {
 
 exception::exception() _LIBCXXRT_NOEXCEPT {}
-exception::~exception() _LIBCXXRT_NOEXCEPT {}
+exception::~exception() {}
 exception::exception(const exception&) _LIBCXXRT_NOEXCEPT {}
 exception& exception::operator=(const exception&) _LIBCXXRT_NOEXCEPT
 {
@@ -44,7 +44,7 @@ const char* exception::what() const _LIBCXXRT_NOEXCEPT
 }
 
 bad_alloc::bad_alloc() _LIBCXXRT_NOEXCEPT {}
-bad_alloc::~bad_alloc() _LIBCXXRT_NOEXCEPT {}
+bad_alloc::~bad_alloc() {}
 bad_alloc::bad_alloc(const bad_alloc&) _LIBCXXRT_NOEXCEPT {}
 bad_alloc& bad_alloc::operator=(const bad_alloc&) _LIBCXXRT_NOEXCEPT
 {
@@ -58,7 +58,7 @@ const char* bad_alloc::what() const _LIBCXXRT_NOEXCEPT
 
 
 bad_cast::bad_cast() _LIBCXXRT_NOEXCEPT {}
-bad_cast::~bad_cast() _LIBCXXRT_NOEXCEPT {}
+bad_cast::~bad_cast() {}
 bad_cast::bad_cast(const bad_cast&) _LIBCXXRT_NOEXCEPT {}
 bad_cast& bad_cast::operator=(const bad_cast&) _LIBCXXRT_NOEXCEPT
 {
@@ -70,7 +70,7 @@ const char* bad_cast::what() const _LIBCXXRT_NOEXCEPT
 }
 
 bad_typeid::bad_typeid() _LIBCXXRT_NOEXCEPT {}
-bad_typeid::~bad_typeid() _LIBCXXRT_NOEXCEPT {}
+bad_typeid::~bad_typeid() {}
 bad_typeid::bad_typeid(const bad_typeid &__rhs) _LIBCXXRT_NOEXCEPT {}
 bad_typeid& bad_typeid::operator=(const bad_typeid &__rhs) _LIBCXXRT_NOEXCEPT
 {
@@ -96,3 +96,4 @@ const char* bad_array_new_length::what() const _LIBCXXRT_NOEXCEPT
 }
 
 } // namespace std
+
diff --git a/contrib/libs/cxxsupp/libcxxrt/stdexcept.h b/contrib/libs/cxxsupp/libcxxrt/stdexcept.h
@@ -40,7 +40,7 @@ namespace std
 		exception() _LIBCXXRT_NOEXCEPT;
 		exception(const exception&) _LIBCXXRT_NOEXCEPT;
 		exception& operator=(const exception&) _LIBCXXRT_NOEXCEPT;
-		virtual ~exception() _LIBCXXRT_NOEXCEPT;
+		virtual ~exception();
 		virtual const char* what() const _LIBCXXRT_NOEXCEPT;
 	};
 
@@ -54,7 +54,7 @@ namespace std
 		bad_alloc() _LIBCXXRT_NOEXCEPT;
 		bad_alloc(const bad_alloc&) _LIBCXXRT_NOEXCEPT;
 		bad_alloc& operator=(const bad_alloc&) _LIBCXXRT_NOEXCEPT;
-		~bad_alloc() _LIBCXXRT_NOEXCEPT;
+		~bad_alloc();
 		virtual const char* what() const _LIBCXXRT_NOEXCEPT;
 	};
 
@@ -66,7 +66,7 @@ namespace std
 		bad_cast() _LIBCXXRT_NOEXCEPT;
 		bad_cast(const bad_cast&) _LIBCXXRT_NOEXCEPT;
 		bad_cast& operator=(const bad_cast&) _LIBCXXRT_NOEXCEPT;
-		virtual ~bad_cast() _LIBCXXRT_NOEXCEPT;
+		virtual ~bad_cast();
 		virtual const char* what() const _LIBCXXRT_NOEXCEPT;
 	};
 
@@ -78,7 +78,7 @@ namespace std
 	public:
 		bad_typeid() _LIBCXXRT_NOEXCEPT;
 		bad_typeid(const bad_typeid &__rhs) _LIBCXXRT_NOEXCEPT;
-		virtual ~bad_typeid() _LIBCXXRT_NOEXCEPT;
+		virtual ~bad_typeid();
 		bad_typeid& operator=(const bad_typeid &__rhs) _LIBCXXRT_NOEXCEPT;
 		virtual const char* what() const _LIBCXXRT_NOEXCEPT;
 	};

diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make
@@ -15,23 +15,18 @@ VERSION(2024-10-14)
 
 ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/76435c4451aeb5e04e9500b090293347a38cef8d.tar.gz)
 
-ADDINCL(
-    contrib/libs/cxxsupp/libcxxrt
+PEERDIR(
+    contrib/libs/libunwind
+    library/cpp/sanitizer/include
 )
 
 NO_COMPILER_WARNINGS()
 
 NO_RUNTIME()
 
-CXXFLAGS(-nostdinc++)
+NO_UTIL()
 
-IF (CXX_UNWIND == "glibcxx_dynamic" OR ARCH_PPC64LE)
-    LDFLAGS(-lgcc_s)
-ELSE()
-    PEERDIR(
-        contrib/libs/libunwind
-    )
-ENDIF()
+CXXFLAGS(-nostdinc++)
 
 IF (SANITIZER_TYPE == undefined OR FUZZING)
     NO_SANITIZE()