libcpp-21

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

include/__locale

@@ -451,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/__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;

lib/buildit

@@ -34,7 +34,7 @@ fi
 
 case $TRIPLE in
   *-apple-*)
-    if [ -z $RC_XBS ]
+    if [ -z $RC_BUILDIT ]
     then
       RC_CFLAGS="-arch i386 -arch x86_64"
     fi
@@ -79,7 +79,7 @@ case $TRIPLE in
     ;;
 esac
 
-if [ -z $RC_XBS ]
+if [ -z $RC_BUILDIT ]
 then
     rm -f libc++.1.$SOEXT*
 fi
@@ -95,7 +95,7 @@ $CC *.o $RC_CFLAGS $LDSHARED_FLAGS $EXTRA_FLAGS
 
 #libtool -static -o libc++.a *.o
 
-if [ -z $RC_XBS ]
+if [ -z $RC_BUILDIT ]
 then
     rm *.o
 fi