Page MenuHomeFreeBSD
Files F96361706

D44325.diff
No OneTemporary
Actions

D44325.diff
View Options

diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile
--- a/lib/libcxxrt/Makefile
+++ b/lib/libcxxrt/Makefile
@@ -1,3 +1,4 @@
+.include <bsd.own.mk>
PACKAGE= clibs
SRCDIR= ${SRCTOP}/contrib/libcxxrt
@@ -22,6 +23,21 @@
WARNS?= 0
CFLAGS+= -isystem ${SRCDIR} -nostdinc++
CXXSTD?= c++14
-VERSION_MAP= ${.CURDIR}/Version.map
+
+.if exists(Version.map.${MACHINE})
+VERSION_MAP= ${.CURDIR}/Version.map.${MACHINE}
+.else
+.if ${MACHINE_ABI:Mlong32}
+VERSION_MAP= Version-32.map
+.else
+VERSION_MAP= Version-64.map
+.endif
+
+Version-32.map: Version.map
+ sed 's/%%NEW_DELETE_TYPE%%/int/' ${.ALLSRC} > ${.TARGET}
+
+Version-64.map: Version.map
+ sed 's/%%NEW_DELETE_TYPE%%/long/' ${.ALLSRC} > ${.TARGET}
+.endif
.include <bsd.lib.mk>
diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map
--- a/lib/libcxxrt/Version.map
+++ b/lib/libcxxrt/Version.map
@@ -10,12 +10,10 @@
__cxa_bad_cast;
__cxa_bad_typeid;
__cxa_begin_catch;
- __cxa_begin_cleanup;
__cxa_call_unexpected;
__cxa_current_exception_type;
__cxa_demangle;
__cxa_end_catch;
- __cxa_end_cleanup;
__cxa_free_exception;
__cxa_get_globals;
__cxa_get_globals_fast;
@@ -26,42 +24,20 @@
__cxa_rethrow;
__cxa_throw;
__cxa_throw_bad_array_new_length;
- __cxa_type_match;
- __cxa_vec_cctor;
- __cxa_vec_cleanup;
- __cxa_vec_ctor;
- __cxa_vec_delete2;
- __cxa_vec_delete3;
- __cxa_vec_delete;
- __cxa_vec_dtor;
- __cxa_vec_new2;
- __cxa_vec_new3;
- __cxa_vec_new;
__dynamic_cast;
- __gxx_personality_sj0;
__gxx_personality_v0;
extern "C++" {
# Type info classes and their destructors
- "__cxxabiv1::__array_type_info";
"__cxxabiv1::__array_type_info::~__array_type_info()";
- "__cxxabiv1::__class_type_info";
"__cxxabiv1::__class_type_info::~__class_type_info()";
- "__cxxabiv1::__enum_type_info";
"__cxxabiv1::__enum_type_info::~__enum_type_info()";
- "__cxxabiv1::__function_type_info::";
"__cxxabiv1::__function_type_info::~__function_type_info()";
- "__cxxabiv1::__fundamental_type_info";
"__cxxabiv1::__fundamental_type_info::~__fundamental_type_info()";
- "__cxxabiv1::__pbase_type_info";
"__cxxabiv1::__pbase_type_info::~__pbase_type_info()";
- "__cxxabiv1::__pointer_to_member_type_info";
"__cxxabiv1::__pointer_to_member_type_info::~__pointer_to_member_type_info()";
- "__cxxabiv1::__pointer_type_info";
"__cxxabiv1::__pointer_type_info::~__pointer_type_info()";
- "__cxxabiv1::__si_class_type_info";
"__cxxabiv1::__si_class_type_info::~__si_class_type_info()";
- "__cxxabiv1::__vmi_class_type_info";
"__cxxabiv1::__vmi_class_type_info::~__vmi_class_type_info()";
# vtables typeinfo classes.
@@ -224,10 +200,6 @@
_ZTIDi;_ZTIPDi;_ZTIPKDi;
# char32_t
_ZTIDs;_ZTIPDs;_ZTIPKDs;
- # IEEE 754r decimal floating point
- _ZTIDd;_ZTIPDd;_ZTIPKDd;
- _ZTIDe;_ZTIPDe;_ZTIPKDe;
- _ZTIDf;_ZTIPDf;_ZTIPKDf;
# IEEE 754r half-precision floating point
_ZTIDh;_ZTIPDh;_ZTIPKDh;
@@ -238,10 +210,6 @@
_ZTSDi;_ZTSPDi;_ZTSPKDi;
# char32_t
_ZTSDs;_ZTSPDs;_ZTSPKDs;
- # IEEE 754r decimal floating point
- _ZTSDd;_ZTSPDd;_ZTSPKDd;
- _ZTSDe;_ZTSPDe;_ZTSPKDe;
- _ZTSDf;_ZTSPDf;_ZTSPKDf;
# IEEE 754r half-precision floating point
_ZTSDh;_ZTSPDh;_ZTSPKDh;
@@ -276,10 +244,8 @@
"typeinfo name for unsigned __int128 const*";
"typeinfo name for unsigned __int128";
"typeinfo name for unsigned __int128*";
- "operator delete[](void*, unsigned int)";
- "operator delete(void*, unsigned int)";
- "operator delete[](void*, unsigned long)";
- "operator delete(void*, unsigned long)";
+ "operator delete[](void*, unsigned %%NEW_DELETE_TYPE%%)";
+ "operator delete(void*, unsigned %%NEW_DELETE_TYPE%%)";
};
} CXXABI_1.3.6;
@@ -325,12 +291,9 @@
extern "C++" {
"operator delete[](void*)";
"operator delete(void*)";
- "operator new[](unsigned int)";
- "operator new(unsigned int)";
- "operator new(unsigned int, std::nothrow_t const&)";
- "operator new[](unsigned long)";
- "operator new(unsigned long)";
- "operator new(unsigned long, std::nothrow_t const&)";
+ "operator new[](unsigned %%NEW_DELETE_TYPE%%)";
+ "operator new(unsigned %%NEW_DELETE_TYPE%%)";
+ "operator new(unsigned %%NEW_DELETE_TYPE%%, std::nothrow_t const&)";
"std::unexpected()";
"std::get_terminate()";
diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map.arm
copy from lib/libcxxrt/Version.map
copy to lib/libcxxrt/Version.map.arm
--- a/lib/libcxxrt/Version.map
+++ b/lib/libcxxrt/Version.map.arm
@@ -10,7 +10,6 @@
__cxa_bad_cast;
__cxa_bad_typeid;
__cxa_begin_catch;
- __cxa_begin_cleanup;
__cxa_call_unexpected;
__cxa_current_exception_type;
__cxa_demangle;
@@ -26,42 +25,20 @@
__cxa_rethrow;
__cxa_throw;
__cxa_throw_bad_array_new_length;
- __cxa_type_match;
- __cxa_vec_cctor;
- __cxa_vec_cleanup;
- __cxa_vec_ctor;
- __cxa_vec_delete2;
- __cxa_vec_delete3;
- __cxa_vec_delete;
- __cxa_vec_dtor;
- __cxa_vec_new2;
- __cxa_vec_new3;
- __cxa_vec_new;
__dynamic_cast;
- __gxx_personality_sj0;
__gxx_personality_v0;
extern "C++" {
# Type info classes and their destructors
- "__cxxabiv1::__array_type_info";
"__cxxabiv1::__array_type_info::~__array_type_info()";
- "__cxxabiv1::__class_type_info";
"__cxxabiv1::__class_type_info::~__class_type_info()";
- "__cxxabiv1::__enum_type_info";
"__cxxabiv1::__enum_type_info::~__enum_type_info()";
- "__cxxabiv1::__function_type_info::";
"__cxxabiv1::__function_type_info::~__function_type_info()";
- "__cxxabiv1::__fundamental_type_info";
"__cxxabiv1::__fundamental_type_info::~__fundamental_type_info()";
- "__cxxabiv1::__pbase_type_info";
"__cxxabiv1::__pbase_type_info::~__pbase_type_info()";
- "__cxxabiv1::__pointer_to_member_type_info";
"__cxxabiv1::__pointer_to_member_type_info::~__pointer_to_member_type_info()";
- "__cxxabiv1::__pointer_type_info";
"__cxxabiv1::__pointer_type_info::~__pointer_type_info()";
- "__cxxabiv1::__si_class_type_info";
"__cxxabiv1::__si_class_type_info::~__si_class_type_info()";
- "__cxxabiv1::__vmi_class_type_info";
"__cxxabiv1::__vmi_class_type_info::~__vmi_class_type_info()";
# vtables typeinfo classes.
@@ -224,10 +201,6 @@
_ZTIDi;_ZTIPDi;_ZTIPKDi;
# char32_t
_ZTIDs;_ZTIPDs;_ZTIPKDs;
- # IEEE 754r decimal floating point
- _ZTIDd;_ZTIPDd;_ZTIPKDd;
- _ZTIDe;_ZTIPDe;_ZTIPKDe;
- _ZTIDf;_ZTIPDf;_ZTIPKDf;
# IEEE 754r half-precision floating point
_ZTIDh;_ZTIPDh;_ZTIPKDh;
@@ -238,10 +211,6 @@
_ZTSDi;_ZTSPDi;_ZTSPKDi;
# char32_t
_ZTSDs;_ZTSPDs;_ZTSPKDs;
- # IEEE 754r decimal floating point
- _ZTSDd;_ZTSPDd;_ZTSPKDd;
- _ZTSDe;_ZTSPDe;_ZTSPKDe;
- _ZTSDf;_ZTSPDf;_ZTSPKDf;
# IEEE 754r half-precision floating point
_ZTSDh;_ZTSPDh;_ZTSPKDh;
@@ -278,8 +247,6 @@
"typeinfo name for unsigned __int128*";
"operator delete[](void*, unsigned int)";
"operator delete(void*, unsigned int)";
- "operator delete[](void*, unsigned long)";
- "operator delete(void*, unsigned long)";
};
} CXXABI_1.3.6;
@@ -328,9 +295,6 @@
"operator new[](unsigned int)";
"operator new(unsigned int)";
"operator new(unsigned int, std::nothrow_t const&)";
- "operator new[](unsigned long)";
- "operator new(unsigned long)";
- "operator new(unsigned long, std::nothrow_t const&)";
"std::unexpected()";
"std::get_terminate()";

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 25, 5:10 PM (18 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12775886
Default Alt Text
D44325.diff (7 KB)

Event Timeline