libcpp-21

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/tags/libcpp-21@130939 91177308-0d34-0410-b5e6-96231b3b80d8

include/__config

@@ -13,13 +13,6 @@
 
 #pragma GCC system_header
 
-#ifdef __MINGW32__
-#include <yvals.h>
-#undef _STD
-#undef _C2
-#define _LIBCPP_VISIBILITY_TAG 0
-#endif
-
 #define _LIBCPP_VERSION 1000
 
 #define _LIBCPP_ABI_VERSION 1
@@ -54,11 +47,6 @@
 # endif  // _BYTE_ORDER == _LITTLE_ENDIAN
 #endif  // __FreeBSD__
 
-#if !defined(_LIBCPP_LITTLE_ENDIAN) && (defined(__i386__) || defined(__x86_64__))
-#define _LIBCPP_LITTLE_ENDIAN 1
-#define _LIBCPP_BIG_ENDIAN    0
-#endif
-
 #if !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
 # include <endian.h>
 # if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -110,7 +98,7 @@ typedef __char32_t char32_t;
 #endif
 #endif
 
-#if !(__has_feature(cxx_exceptions)) || defined(__MINGW32__)
+#if !(__has_feature(cxx_exceptions))
 #define _LIBCPP_NO_EXCEPTIONS
 #endif
 

include/__locale

@@ -19,21 +19,7 @@
 #include <cstdint>
 #include <cctype>
 #include <locale.h>
-#ifdef __MINGW32__
-typedef _locale_t locale_t;
-
-#include <xlocinfo.h>
-#define LC_COLLATE_MASK _M_COLLATE
-#define LC_CTYPE_MASK _M_CTYPE
-#define LC_MONETARY_MASK _M_MONETARY
-#define LC_NUMERIC_MASK _M_NUMERIC
-#define LC_TIME_MASK _M_TIME
-#define LC_MESSAGES_MASK _M_MESSAGES
-#define LC_ALL_MASK _M_ALL
-
-#else
 #include <xlocale.h>
-#endif
 
 #pragma GCC system_header
 
@@ -316,7 +302,7 @@ locale::operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
 class _LIBCPP_VISIBLE ctype_base
 {
 public:
-    typedef std::uint32_t mask;
+    typedef __uint32_t mask;
 
 #if __APPLE__
     static const mask space  = _CTYPE_S;
@@ -329,17 +315,6 @@ public:
     static const mask punct  = _CTYPE_P;
     static const mask xdigit = _CTYPE_X;
     static const mask blank  = _CTYPE_B;
-#elif defined(__MINGW32__)
-    static const mask space  = _SPACE;
-    static const mask print  = (_BLANK|_PUNCT|_ALPHA|_DIGIT);
-    static const mask cntrl  = _CONTROL;
-    static const mask upper  = _UPPER;
-    static const mask lower  = _LOWER;
-    static const mask alpha  = _ALPHA;
-    static const mask digit  = _DIGIT;
-    static const mask punct  = _PUNCT;
-    static const mask xdigit = _HEX;
-    static const mask blank  = _BLANK;
 #else  // __APPLE__
     static const mask space  = _ISspace;
     static const mask print  = _ISprint;
@@ -476,7 +451,7 @@ public:
     _LIBCPP_ALWAYS_INLINE
     bool is(mask __m, char_type __c) const
     {
-        return isascii(__c) ? (__tab_ ? __tab_[__c] & __m : _isctype(__c, __m)) : false;
+        return isascii(__c) ? __tab_[__c] & __m : false;
     }
 
     _LIBCPP_ALWAYS_INLINE

include/__mutex_base

@@ -14,35 +14,7 @@
 #include <__config>
 #include <chrono>
 #include <system_error>
-#ifdef __MINGW32__
-typedef unsigned pthread_t;
-typedef unsigned pthread_mutex_t;
-typedef unsigned pthread_mutexattr_t;
-typedef unsigned pthread_cond_t;
-typedef unsigned pthread_key_t;
-#define PTHREAD_MUTEX_INITIALIZER 0
-#define PTHREAD_COND_INITIALIZER 0
-#define PTHREAD_MUTEX_RECURSIVE 0
-#define pthread_mutex_init(a,b) (*(a) = 0, -1)
-#define pthread_mutex_destroy(a) (-1)
-#define pthread_mutex_lock(a) (-1)
-#define pthread_mutex_trylock(a) (-1)
-#define pthread_mutex_unlock(a) (-1)
-#define pthread_mutexattr_settype(a,b) (*(a) = (b), -1)
-#define pthread_mutexattr_init(a) (*(a) = 0, -1)
-#define pthread_mutexattr_destroy(a) (-1)
-#define pthread_self() (-1)
-#define pthread_equal(a,b) (0)
-#define pthread_getspecific(a) ((void*)0)
-#define pthread_cond_destroy(a) (-1)
-#define pthread_cond_signal(a) (-1)
-#define pthread_cond_broadcast(a) (-1)
-#define pthread_cond_wait(a,b) (-1)
-#define pthread_cond_timedwait(a,b,c) (-1)
-#define sched_yield() (-1)
-#else
 #include <pthread.h>
-#endif
 
 #pragma GCC system_header
 

include/__std_stream

@@ -288,12 +288,12 @@ __stdoutbuf<_CharT>::sync()
         __r = __cv_->unshift(__st_, __extbuf,
                                     __extbuf + sizeof(__extbuf),
                                     __extbe);
-        if (__r == codecvt_base::error)
-            return -1;
         size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
         if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
             return -1;
     } while (__r == codecvt_base::partial);
+    if (__r == codecvt_base::error)
+        return -1;
     if (fflush(__file_))
         return -1;
     return 0;

include/fstream

@@ -173,11 +173,6 @@ typedef basic_fstream<wchar_t> wfstream;
 
 #pragma GCC system_header
 
-#ifdef _WIN32
-#define fseeko fseek
-#define ftello ftell
-#endif
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _CharT, class _Traits>

include/locale

@@ -186,10 +186,7 @@ template <class charT> class messages_byname;
 #endif
 #include <cstdlib>
 #include <ctime>
-
-#ifndef _WIN32
 #include <nl_types.h>
-#endif
 
 #pragma GCC system_header
 
@@ -306,14 +303,7 @@ __nolocale_asprintf(char** __ret,
 {
     va_list __ap;
     va_start(__ap, __format);
-	int __result;
-#ifdef _WIN32
-	*__ret = (char*)malloc(4096);
-	__result = vsprintf(*__ret, __format, __ap);
-	*__ret = (char*)realloc(*__ret, __result + 1);
-#else
-	__result = vasprintf(__ret, __format, __ap);
-#endif
+    int __result = vasprintf(__ret, __format, __ap);
     va_end(__ap);
     return __result;
 }
@@ -758,12 +748,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
         int __save_errno = errno;
         errno = 0;
         char *__p2;
-        long long __ll;
-#ifdef _WIN32
-        __ll = _strtoi64_l(__a, &__p2, __base, 0);
-#else
-        __ll = strtoll_l(__a, &__p2, __base, 0);
-#endif
+        long long __ll = strtoll_l(__a, &__p2, __base, 0);
         int __current_errno = errno;
         if (__current_errno == 0)
             errno = __save_errno;
@@ -803,12 +788,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
         int __save_errno = errno;
         errno = 0;
         char *__p2;
-        unsigned long long __ll;
-#ifdef _WIN32
-        __ll = _strtoui64_l(__a, &__p2, __base, 0);
-#else
-        __ll = strtoull_l(__a, &__p2, __base, 0);
-#endif
+        unsigned long long __ll = strtoull_l(__a, &__p2, __base, 0);
         int __current_errno = errno;
         if (__current_errno == 0)
             errno = __save_errno;
@@ -836,13 +816,7 @@ __num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)
     if (__a != __a_end)
     {
         char *__p2;
-        long double __ld;
-#ifdef _WIN32
-        // Win32 does not use "long double".
-        __ld = _strtod_l(__a, &__p2, 0);
-#else
-        __ld = strtold_l(__a, &__p2, 0);
-#endif
+        long double __ld = strtold_l(__a, &__p2, 0);
         if (__p2 != __a_end)
         {
             __err = ios_base::failbit;
@@ -1702,17 +1676,11 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
 template <class _CharT, class _OutputIterator>
 _OutputIterator
 num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long double __lv) const
+                                         char_type __fl, long double __v) const
 {
     // Stage 1 - Get number in narrow char
     char __fmt[8] = {'%', 0};
-#ifdef _WIN32
-    const char* __len = "";
-    double __v = __lv;
-#else
     const char* __len = "L";
-    long double __v = __lv;
-#endif
     bool __specify_precision = this->__format_float(__fmt+1, __len, __iob.flags());
     const unsigned __nbuf = 30;
     char __nar[__nbuf];
@@ -3597,14 +3565,10 @@ template <class _CharT>
 typename messages<_CharT>::catalog
 messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
 {
-#ifdef __MINGW32__
-    return -1;
-#else
     catalog __cat = reinterpret_cast<catalog>(catopen(__nm.c_str(), NL_CAT_LOCALE));
     if (__cat != -1)
         __cat = static_cast<catalog>((static_cast<size_t>(__cat) >> 1));
     return __cat;
-#endif
 }
 
 template <class _CharT>
@@ -3612,10 +3576,6 @@ typename messages<_CharT>::string_type
 messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
                          const string_type& __dflt) const
 {
-#ifdef __MINGW32__
-    string_type __w;
-	return __w;
-#else
     string __ndflt;
     __narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__ndflt),
                                                        __dflt.c_str(),
@@ -3628,19 +3588,16 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
     __widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__w),
                                                         __n, __n + strlen(__n));
     return __w;
-#endif
 }
 
 template <class _CharT>
 void
 messages<_CharT>::do_close(catalog __c) const
 {
-#ifndef __MINGW32__
     if (__c != -1)
         __c <<= 1;
     nl_catd __cat = reinterpret_cast<nl_catd>(__c);
     catclose(__cat);
-#endif
 }
 
 extern template class messages<char>;

include/new

@@ -90,18 +90,6 @@ _LIBCPP_VISIBLE new_handler get_new_handler() throw();
 
 }  // std
 
-#if __APPLE__
-    #include <cxxabi.h>
-    // On Darwin, there are two STL shared libraries and a lower level ABI
-    // shared libray.  The global holding the current new handler is
-    // in the ABI library and named __cxa_new_handler.
-    #define __new_handler __cxxabiapple::__cxa_new_handler
-#else  // __APPLE__
-    _LIBCPP_BEGIN_NAMESPACE_STD
-        extern ::std::new_handler __new_handler;
-    _LIBCPP_END_NAMESPACE_STD
-#endif
-
 _LIBCPP_VISIBLE void* operator new(std::size_t) throw(std::bad_alloc);
 _LIBCPP_VISIBLE void* operator new(std::size_t, const std::nothrow_t&) throw();
 _LIBCPP_VISIBLE void  operator delete(void*) throw();

include/system_error

@@ -115,22 +115,22 @@ public:
 
 enum class errc
 {
-//    address_family_not_supported,       // EAFNOSUPPORT
-//    address_in_use,                     // EADDRINUSE
-//    address_not_available,              // EADDRNOTAVAIL
-//    already_connected,                  // EISCONN
+    address_family_not_supported,       // EAFNOSUPPORT
+    address_in_use,                     // EADDRINUSE
+    address_not_available,              // EADDRNOTAVAIL
+    already_connected,                  // EISCONN
     argument_list_too_long,             // E2BIG
     argument_out_of_domain,             // EDOM
     bad_address,                        // EFAULT
     bad_file_descriptor,                // EBADF
-//    bad_message,                        // EBADMSG
+    bad_message,                        // EBADMSG
     broken_pipe,                        // EPIPE
-//    connection_aborted,                 // ECONNABORTED
-//    connection_already_in_progress,     // EALREADY
-//    connection_refused,                 // ECONNREFUSED
-//    connection_reset,                   // ECONNRESET
+    connection_aborted,                 // ECONNABORTED
+    connection_already_in_progress,     // EALREADY
+    connection_refused,                 // ECONNREFUSED
+    connection_reset,                   // ECONNRESET
     cross_device_link,                  // EXDEV
-//    destination_address_required,       // EDESTADDRREQ
+    destination_address_required,       // EDESTADDRREQ
     device_or_resource_busy,            // EBUSY
     directory_not_empty,                // ENOTEMPTY
     executable_format_error,            // ENOEXEC
@@ -138,8 +138,8 @@ enum class errc
     file_too_large,                     // EFBIG
     filename_too_long,                  // ENAMETOOLONG
     function_not_supported,             // ENOSYS
-//    host_unreachable,                   // EHOSTUNREACH
-//    identifier_removed,                 // EIDRM
+    host_unreachable,                   // EHOSTUNREACH
+    identifier_removed,                 // EIDRM
     illegal_byte_sequence,              // EILSEQ
     inappropriate_io_control_operation, // ENOTTY
     interrupted,                        // EINTR
@@ -147,16 +147,16 @@ enum class errc
     invalid_seek,                       // ESPIPE
     io_error,                           // EIO
     is_a_directory,                     // EISDIR
-//    message_size,                       // EMSGSIZE
-//    network_down,                       // ENETDOWN
-//    network_reset,                      // ENETRESET
-//    network_unreachable,                // ENETUNREACH
-//    no_buffer_space,                    // ENOBUFS
+    message_size,                       // EMSGSIZE
+    network_down,                       // ENETDOWN
+    network_reset,                      // ENETRESET
+    network_unreachable,                // ENETUNREACH
+    no_buffer_space,                    // ENOBUFS
     no_child_process,                   // ECHILD
-//    no_link,                            // ENOLINK
+    no_link,                            // ENOLINK
     no_lock_available,                  // ENOLCK
     no_message_available,               // ENODATA
-//    no_message,                         // ENOMSG
+    no_message,                         // ENOMSG
     no_protocol_option,                 // ENOPROTOOPT
     no_space_on_device,                 // ENOSPC
     no_stream_resources,                // ENOSR
@@ -246,42 +246,22 @@ struct _LIBCPP_VISIBLE is_error_condition_enum
 struct errc
 {
 enum _ {
-#ifdef EAFNOSUPPORT
     address_family_not_supported        = EAFNOSUPPORT,
-#endif
-#ifdef EADDRINUSE
     address_in_use                      = EADDRINUSE,
-#endif
-#ifdef EADDRNOTAVAIL
     address_not_available               = EADDRNOTAVAIL,
-#endif
-#ifdef EISCONN
     already_connected                   = EISCONN,
-#endif
     argument_list_too_long              = E2BIG,
     argument_out_of_domain              = EDOM,
     bad_address                         = EFAULT,
     bad_file_descriptor                 = EBADF,
-#ifdef EBADMSG
     bad_message                         = EBADMSG,
-#endif
     broken_pipe                         = EPIPE,
-#ifdef ECONNABORTED
     connection_aborted                  = ECONNABORTED,
-#endif
-#ifdef EALREADY
     connection_already_in_progress      = EALREADY,
-#endif
-#ifdef ECONNREFUSED
     connection_refused                  = ECONNREFUSED,
-#endif
-#ifdef ECONNRESET
     connection_reset                    = ECONNRESET,
-#endif
     cross_device_link                   = EXDEV,
-#ifdef EDESTADDRREQ
     destination_address_required        = EDESTADDRREQ,
-#endif
     device_or_resource_busy             = EBUSY,
     directory_not_empty                 = ENOTEMPTY,
     executable_format_error             = ENOEXEC,
@@ -289,12 +269,8 @@ enum _ {
     file_too_large                      = EFBIG,
     filename_too_long                   = ENAMETOOLONG,
     function_not_supported              = ENOSYS,
-#ifdef EHOSTUNREACH
     host_unreachable                    = EHOSTUNREACH,
-#endif
-#ifdef EIDRM
     identifier_removed                  = EIDRM,
-#endif
     illegal_byte_sequence               = EILSEQ,
     inappropriate_io_control_operation  = ENOTTY,
     interrupted                         = EINTR,
@@ -302,37 +278,21 @@ enum _ {
     invalid_seek                        = ESPIPE,
     io_error                            = EIO,
     is_a_directory                      = EISDIR,
-#ifdef EMSGSIZE
     message_size                        = EMSGSIZE,
-#endif
-#ifdef ENETDOWN
     network_down                        = ENETDOWN,
-#endif
-#ifdef ENETRESET
     network_reset                       = ENETRESET,
-#endif
-#ifdef ENETUNREACH
     network_unreachable                 = ENETUNREACH,
-#endif
-#ifdef ENOBUFS
     no_buffer_space                     = ENOBUFS,
-#endif
     no_child_process                    = ECHILD,
-#ifdef ENOLINK
     no_link                             = ENOLINK,
-#endif
     no_lock_available                   = ENOLCK,
-#ifdef ENOMSG
 #ifdef ENODATA
     no_message_available                = ENODATA,
 #else
     no_message_available                = ENOMSG,
 #endif
     no_message                          = ENOMSG,
-#endif
-#ifdef ENOPROTOOPT,
     no_protocol_option                  = ENOPROTOOPT,
-#endif
     no_space_on_device                  = ENOSPC,
 #ifdef ENOSR
     no_stream_resources                 = ENOSR,
@@ -344,42 +304,24 @@ enum _ {
     no_such_file_or_directory           = ENOENT,
     no_such_process                     = ESRCH,
     not_a_directory                     = ENOTDIR,
-#ifdef ENOTSOCK
     not_a_socket                        = ENOTSOCK,
-#endif
 #ifdef ENOSTR
     not_a_stream                        = ENOSTR,
 #else
     not_a_stream                        = EINVAL,
 #endif
-#ifdef ENOTCONN
     not_connected                       = ENOTCONN,
-#endif
     not_enough_memory                   = ENOMEM,
-#ifdef ENOTSUP
     not_supported                       = ENOTSUP,
-#endif
-#ifdef ECANCELED
     operation_canceled                  = ECANCELED,
-#endif
-#ifdef EINPROGRESS
     operation_in_progress               = EINPROGRESS,
-#endif
     operation_not_permitted             = EPERM,
-#ifdef EOPNOTSUPP
     operation_not_supported             = EOPNOTSUPP,
-#endif
-#ifdef EWOULDBLOCK
     operation_would_block               = EWOULDBLOCK,
-#endif
     owner_dead                          = EOWNERDEAD,
     permission_denied                   = EACCES,
-#ifdef EPROTO
     protocol_error                      = EPROTO,
-#endif
-#ifdef EPROTONOSUPPORT
     protocol_not_supported              = EPROTONOSUPPORT,
-#endif
     read_only_file_system               = EROFS,
     resource_deadlock_would_occur       = EDEADLK,
     resource_unavailable_try_again      = EAGAIN,
@@ -387,27 +329,17 @@ enum _ {
     state_not_recoverable               = ENOTRECOVERABLE,
 #ifdef ETIME
     stream_timeout                      = ETIME,
-#elif defined(ETIMEDOUT)
+#else
     stream_timeout                      = ETIMEDOUT,
 #endif
-#ifdef ETXTBSY
     text_file_busy                      = ETXTBSY,
-#endif
-#ifdef ETIMEDOUT
     timed_out                           = ETIMEDOUT,
-#endif
     too_many_files_open_in_system       = ENFILE,
     too_many_files_open                 = EMFILE,
     too_many_links                      = EMLINK,
-#ifdef ELOOP
     too_many_symbolic_link_levels       = ELOOP,
-#endif
-#ifdef EOVERFLOW
     value_too_large                     = EOVERFLOW,
-#endif
-#ifdef EPROTOTYPE
-    wrong_protocol_type                 = EPROTOTYPE,
-#endif
+    wrong_protocol_type                 = EPROTOTYPE
 };
 
     _ __v_;

include/thread

@@ -95,15 +95,7 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #include <system_error>
 #include <chrono>
 #include <__mutex_base>
-#ifdef __MINGW32__
-#define pthread_key_delete(a) (-1)
-#define pthread_join(a,b) (-1)
-#define pthread_detach(a) (-1)
-#define nanosleep(a,b) (-1)
-#define pthread_key_create(a,b) (-1)
-#else
 #include <pthread.h>
-#endif
 
 #pragma GCC system_header
 

lib/CMakeLists.txt

@@ -32,7 +32,7 @@ append_if(libraries LIBCXX_HAS_GCC_S_LIB gcc_s)
 target_link_libraries(cxx ${libraries})
 
 # Setup flags.
-#append_if(compile_flags LIBCXX_HAS_FPIC_FLAG -fPIC)
+append_if(compile_flags LIBCXX_HAS_FPIC_FLAG -fPIC)
 append_if(link_flags LIBCXX_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)
 
 set_target_properties(cxx

lib/buildit

@@ -17,6 +17,11 @@ then
 	CXX=clang++
 fi
 
+if [ -z "$CC" ]
+then
+    CC=clang
+fi
+
 if [ -z $MACOSX_DEPLOYMENT_TARGET ]
 then
   MACOSX_DEPLOYMENT_TARGET=10.6
@@ -45,16 +50,24 @@ case $TRIPLE in
 			-Wl,-unexported_symbols_list,libc++unexp.exp  \
 			/usr/lib/libSystem.B.dylib"
 	else
-	    EXTRA_FLAGS="-std=c++0x"
-		LDSHARED_FLAGS="-o libc++.1.dylib \
+		EXTRA_FLAGS="-std=c++0x "
+		RE_EXPORT_FILE="libc++abi.exp"
+		if [ -n "$SDKROOT" ]
+		then
+			EXTRA_FLAGS+="-isysroot ${SDKROOT}"
+			RE_EXPORT_FILE="libc++sjlj-abi.exp"
+			CXX=`xcrun -sdk "${SDKROOT}"  -find clang++`
+			CC=`xcrun -sdk "${SDKROOT}"  -find clang`
+		fi
+	    LDSHARED_FLAGS="-o libc++.1.dylib \
 			-dynamiclib -nodefaultlibs  \
 			-current_version ${RC_ProjectSourceVersion} -compatibility_version 1 \
 			-install_name /usr/lib/libc++.1.dylib \
 			${SDKROOT}/usr/lib/libc++abi.dylib \
 			-lSystem  \
 			-Wl,-unexported_symbols_list,libc++unexp.exp  \
-			-Wl,-reexported_symbols_list,libc++abi.exp \
-			-Wl,-force_symbols_not_weak_list,notweak.exp"
+                        -Wl,-reexported_symbols_list,${RE_EXPORT_FILE}  \
+			-Wl,-force_symbols_not_weak_list,notweak.exp "
 	fi
     ;;
   *)
@@ -78,7 +91,7 @@ for FILE in ../src/*.cpp; do
 done
 
 
-cc *.o $RC_CFLAGS $LDSHARED_FLAGS
+$CC *.o $RC_CFLAGS $LDSHARED_FLAGS $EXTRA_FLAGS
 
 #libtool -static -o libc++.a *.o
 

lib/libc++sjlj-abi.exp

@@ -0,0 +1,159 @@
+___cxa_allocate_exception
+___cxa_end_catch
+___cxa_demangle
+___cxa_current_exception_type
+___cxa_call_unexpected
+___cxa_free_exception
+___cxa_get_exception_ptr
+___cxa_get_globals
+___cxa_get_globals_fast
+___cxa_guard_abort
+___cxa_guard_acquire
+___cxa_guard_release
+___cxa_rethrow
+___cxa_pure_virtual
+___cxa_begin_catch
+___cxa_throw
+___cxa_vec_cctor
+___cxa_vec_cleanup
+___cxa_vec_ctor
+___cxa_vec_delete
+___cxa_vec_delete2
+___cxa_vec_delete3
+___cxa_vec_dtor
+___cxa_vec_new
+___cxa_vec_new2
+___cxa_vec_new3
+___dynamic_cast
+___gxx_personality_sj0
+#__ZTIDi
+#__ZTIDn
+#__ZTIDs
+#__ZTIPDi
+#__ZTIPDn
+#__ZTIPDs
+#__ZTIPKDi
+#__ZTIPKDn
+#__ZTIPKDs
+__ZTSPm
+__ZTSPl
+__ZTSPj
+__ZTSPi
+__ZTSPh
+__ZTSPf
+__ZTSPe
+__ZTSPd
+__ZTSPc
+__ZTSPb
+__ZTSPa
+__ZTSPKc
+__ZTSPKy
+__ZTSPKx
+__ZTSPKw
+__ZTSPKv
+__ZTSPKt
+__ZTSPKs
+__ZTSPKm
+__ZTSPKl
+__ZTSPKi
+__ZTSPKh
+__ZTSPs
+__ZTSPt
+__ZTSPv
+__ZTSPw
+__ZTSPKa
+__ZTSPx
+__ZTSPy
+__ZTSPKd
+__ZTSPKe
+__ZTSPKj
+__ZTSPKb
+__ZTSPKf
+__ZTSv
+__ZTSt
+__ZTSs
+__ZTSm
+__ZTSl
+__ZTSj
+__ZTSi
+__ZTSh
+__ZTSf
+__ZTSe
+__ZTSd
+__ZTSc
+__ZTSw
+__ZTSx
+__ZTSy
+__ZTSb
+__ZTSa
+__ZTIPKh
+__ZTIPKf
+__ZTIPKe
+__ZTIPKd
+__ZTIPKc
+__ZTIPKb
+__ZTIPKa
+__ZTIPy
+__ZTIPx
+__ZTIPw
+__ZTIPv
+__ZTIPt
+__ZTIPs
+__ZTIPm
+__ZTIPl
+__ZTIPj
+__ZTIPi
+__ZTIPKi
+__ZTIPKj
+__ZTIPKl
+__ZTIPKm
+__ZTIPKs
+__ZTIPKt
+__ZTIPKv
+__ZTIPKw
+__ZTIPKx
+__ZTIPKy
+__ZTIPa
+__ZTIPb
+__ZTIPc
+__ZTIPd
+__ZTIPe
+__ZTIPf
+__ZTIPh
+__ZTVN10__cxxabiv129__pointer_to_member_type_infoE
+__ZTVN10__cxxabiv116__enum_type_infoE
+__ZTVN10__cxxabiv117__array_type_infoE
+__ZTVN10__cxxabiv117__class_type_infoE
+__ZTVN10__cxxabiv117__pbase_type_infoE
+__ZTVN10__cxxabiv119__pointer_type_infoE
+__ZTVN10__cxxabiv120__function_type_infoE
+__ZTVN10__cxxabiv120__si_class_type_infoE
+__ZTVN10__cxxabiv121__vmi_class_type_infoE
+__ZTVN10__cxxabiv123__fundamental_type_infoE
+__ZTIa
+__ZTIb
+__ZTIc
+__ZTId
+__ZTIe
+__ZTIf
+__ZTIh
+__ZTIi
+__ZTIj
+__ZTIl
+__ZTIm
+__ZTIs
+__ZTIt
+__ZTSN10__cxxabiv129__pointer_to_member_type_infoE
+__ZTSN10__cxxabiv123__fundamental_type_infoE
+__ZTSN10__cxxabiv121__vmi_class_type_infoE
+__ZTSN10__cxxabiv120__si_class_type_infoE
+__ZTSN10__cxxabiv120__function_type_infoE
+__ZTSN10__cxxabiv119__pointer_type_infoE
+__ZTSN10__cxxabiv117__pbase_type_infoE
+__ZTSN10__cxxabiv117__class_type_infoE
+__ZTSN10__cxxabiv117__array_type_infoE
+__ZTSN10__cxxabiv116__enum_type_infoE
+__ZTIy
+__ZTIx
+__ZTIw
+__ZTIv

src/chrono.cpp

@@ -116,16 +116,10 @@ steady_clock::now()
 steady_clock::time_point
 steady_clock::now()
 {
-#ifdef __MINGW32__
-    timeval tv;
-    gettimeofday(&tv, 0);
-    return time_point(seconds(tv.tv_sec) + microseconds(tv.tv_usec));
-#else
     struct timespec tp;
     if (0 != clock_gettime(CLOCK_MONOTONIC, &tp))
         __throw_system_error(errno, "clock_gettime(CLOCK_MONOTONIC) failed");
     return time_point(seconds(tp.tv_sec) + nanoseconds(tp.tv_nsec));
-#endif
 }
 #endif  // __APPLE__
 

src/condition_variable.cpp

@@ -57,10 +57,8 @@ condition_variable::__do_timed_wait(unique_lock<mutex>& lk,
     ts.tv_sec = static_cast<decltype(ts.tv_sec)>(s.count());
     ts.tv_nsec = static_cast<decltype(ts.tv_nsec)>((d - s).count());
     int ec = pthread_cond_timedwait(&__cv_, lk.mutex()->native_handle(), &ts);
-#ifndef __MINGW32__
     if (ec != 0 && ec != ETIMEDOUT)
         __throw_system_error(ec, "condition_variable timed_wait failed");
-#endif
 }
 
 void

src/exception.cpp

@@ -77,9 +77,6 @@ std::terminate()
 
 bool std::uncaught_exception() throw()
 {
-#ifdef _LIBCPP_NO_EXCEPTIONS
-    return false;
-#endif
 #if __APPLE__
     // on Darwin, there is a helper function so __cxa_get_globals is private
     return __cxxabiapple::__cxa_uncaught_exception();

src/locale.cpp

@@ -18,20 +18,7 @@
 #include "cstring"
 #include "cwctype"
 #include "__sso_allocator"
-#ifdef __MINGW32__
-#define iswctype_l _iswctype_l
-#define strcoll_l _strcoll_l
-#define strftime_l(a,b,c,d,e) strftime(a,b,c,d)
-#define strxfrm_l _strxfrm_l
-#define tolower_l _tolower_l
-#define toupper_l _toupper_l
-#define towlower_l _towlower_l
-#define towupper_l _towupper_l
-#define wcscoll_l _wcscoll_l
-#define wcsxfrm_l _wcsxfrm_l
-#else
 #include <langinfo.h>
-#endif
 #include <stdlib.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
@@ -574,22 +561,6 @@ locale::id::__init()
 
 // template <> class collate_byname<char>
 
-static inline
-locale_t newlocale(int m, const char *l, locale_t b) {
-#if 0
-  return _create_locale(LC_ALL, l);
-#else
-  return 0;
-#endif
-}
-
-static inline
-void freelocale(locale_t p) {
-#if 0 // why!
-  _free_locale(p);
-#endif
-}
-
 collate_byname<char>::collate_byname(const char* n, size_t refs)
     : collate<char>(refs),
       __l(newlocale(LC_ALL_MASK, n, 0))
@@ -1388,9 +1359,6 @@ codecvt<wchar_t, char, mbstate_t>::do_unshift(state_type& st,
     for (extern_type* p = tmp; n; --n)  // write it
         *to_nxt++ = *p++;
     return ok;
-#elif defined(_WIN32)
-    to_nxt = to;
-    return noconv;
 #else
     return error;
 #endif

src/new.cpp

@@ -18,16 +18,110 @@
     // in the ABI library and named __cxa_new_handler.
     #define __new_handler __cxxabiapple::__cxa_new_handler
 #else  // __APPLE__
-    _LIBCPP_BEGIN_NAMESPACE_STD
-        ::std::new_handler __new_handler;
-    _LIBCPP_END_NAMESPACE_STD
+    static std::new_handler __new_handler;
 #endif
 
-#if 0
 // Implement all new and delete operators as weak definitions
 // in this shared library, so that they can be overriden by programs
 // that define non-weak copies of the functions.
+
+__attribute__((__weak__, __visibility__("default")))
+void *
+operator new(std::size_t size) throw (std::bad_alloc)
+{
+    if (size == 0)
+        size = 1;
+    void* p;
+    while ((p = ::malloc(size)) == 0)
+    {
+        // If malloc fails and there is a new_handler,
+        // call it to try free up memory.
+        std::new_handler nh = std::get_new_handler();
+        if (nh)
+            nh();
+        else
+#ifndef _LIBCPP_NO_EXCEPTIONS
+            throw std::bad_alloc();
+#else
+            break;
 #endif
+    }
+    return p;
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void*
+operator new(size_t size, const std::nothrow_t&) throw()
+{
+    void* p = 0;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    try
+    {
+#endif  // _LIBCPP_NO_EXCEPTIONS
+        p = ::operator new(size);
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    }
+    catch (...)
+    {
+    }
+#endif  // _LIBCPP_NO_EXCEPTIONS
+    return p;
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void*
+operator new[](size_t size) throw (std::bad_alloc)
+{
+    return ::operator new(size);
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void*
+operator new[](size_t size, const std::nothrow_t& nothrow) throw()
+{
+    void* p = 0;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    try
+    {
+#endif  // _LIBCPP_NO_EXCEPTIONS
+        p = ::operator new[](size);
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    }
+    catch (...)
+    {
+    }
+#endif  // _LIBCPP_NO_EXCEPTIONS
+    return p;
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void
+operator delete(void* ptr) throw ()
+{
+    if (ptr)
+        ::free(ptr);
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void
+operator delete(void* ptr, const std::nothrow_t&) throw ()
+{
+    ::operator delete(ptr);
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void
+operator delete[] (void* ptr) throw ()
+{
+    ::operator delete (ptr);
+}
+
+__attribute__((__weak__, __visibility__("default")))
+void
+operator delete[] (void* ptr, const std::nothrow_t&) throw ()
+{
+    ::operator delete[](ptr);
+}
 
 namespace std
 {

src/new_ZdaPv.cpp

@@ -1,7 +0,0 @@
-#include "new"
-
-void
-operator delete[] (void* ptr) throw ()
-{
-    ::operator delete (ptr);
-}

src/new_ZdaPvRKSt9nothrow_t.cpp

@@ -1,7 +0,0 @@
-#include "new"
-
-void
-operator delete[] (void* ptr, const std::nothrow_t&) throw ()
-{
-    ::operator delete[](ptr);
-}

src/new_ZdlPv.cpp

@@ -1,10 +0,0 @@
-#include <stdlib.h>
-
-#include "new"
-
-void
-operator delete(void* ptr) throw ()
-{
-    if (ptr)
-        ::free(ptr);
-}

src/new_ZdlPvRKSt9nothrow_t.cpp

@@ -1,7 +0,0 @@
-#include "new"
-
-void
-operator delete(void* ptr, const std::nothrow_t&) throw ()
-{
-    ::operator delete(ptr);
-}

src/new_Znay.cpp

@@ -1,7 +0,0 @@
-#include "new"
-
-void*
-operator new[](size_t size) throw (std::bad_alloc)
-{
-    return ::operator new(size);
-}

src/new_ZnayRKSt9nothrow_t.cpp

@@ -1,19 +0,0 @@
-#include "new"
-
-void*
-operator new[](size_t size, const std::nothrow_t& nothrow) throw()
-{
-    void* p = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        p = ::operator new[](size);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return p;
-}

src/new_Znwy.cpp

@@ -1,26 +0,0 @@
-#include <stdlib.h>
-
-#include "new"
-
-void *
-operator new(std::size_t size) throw (std::bad_alloc)
-{
-    if (size == 0)
-        size = 1;
-    void* p;
-    while ((p = ::malloc(size)) == 0)
-    {
-        // If malloc fails and there is a new_handler,
-        // call it to try free up memory.
-        std::new_handler nh = std::get_new_handler();
-        if (nh)
-            nh();
-        else
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw std::bad_alloc();
-#else
-            break;
-#endif
-    }
-    return p;
-}

src/new_ZnwyRKSt9nothrow_t.cpp

@@ -1,19 +0,0 @@
-#include "new"
-
-void*
-operator new(size_t size, const std::nothrow_t&) throw()
-{
-    void* p = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        p = ::operator new(size);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return p;
-}

src/string.cpp

@@ -7,17 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define MINGW_HAS_SECURE_API
-
 #include "string"
 #include "cstdlib"
 #include "cwchar"
 #include "cerrno"
 
-#ifdef _WIN32
-#define swprintf swprintf_s
-#endif
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template class __basic_string_common<true>;

src/thread.cpp

@@ -12,10 +12,7 @@
 #include "vector"
 #include "future"
 #include <sys/types.h>
-#ifdef __MINGW32__
-#else
 #include <sys/sysctl.h>
-#endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 

test/_win32_seterrormode.fail.cpp

@@ -1,15 +0,0 @@
-#include <windows.h>
-
-namespace {
-
-  class Win32ctor {
-  public:
-    Win32ctor() {
-      SetErrorMode(SEM_FAILCRITICALERRORS |
-                   SEM_NOGPFAULTERRORBOX |
-                   SEM_NOOPENFILEERRORBOX);
-    }
-  };
-
-  static Win32ctor ctor;
-}