Revert "Fix cxa_demangle compile errors". By feedback from azakai, we want to keep our libcxxabi clean from custom changes w.r.t. upsstream libcxxabi.

This reverts commit 848c186df3a8f1eff6e7b1af0b08df25aefae0e3.

1 files changed, 4 insertions, 4 deletions

diff --git a/system/lib/libcxxabi/src/cxa_demangle.cpp b/system/lib/libcxxabi/src/cxa_demangle.cpp
index 804ea7ce..c1e12603 100644
--- a/system/lib/libcxxabi/src/cxa_demangle.cpp
+++ b/system/lib/libcxxabi/src/cxa_demangle.cpp
@@ -5695,7 +5695,7 @@ public:
             if (__right_ != 0)
                 r += __right_->size();
             else if (__size_ != 0)
-                r += static_cast<size_t>(snprintf(0, 0, "%lu", static_cast<unsigned long>(__size_)));
+                r += static_cast<size_t>(snprintf(0, 0, "%ld", __size_));
             const_cast<long&>(__cached_size_) = static_cast<long>(r);
         }
         return static_cast<size_t>(__cached_size_);
@@ -5710,7 +5710,7 @@ public:
             buf = __right_->get_demangled_name(buf);
         else if (__size_ != 0)
         {
-            int rs = sprintf(buf, "%lu", static_cast<unsigned long>(__size_));
+            int rs = sprintf(buf, "%ld", __size_);
             buf += rs;
         }
         *buf++ = ']';
@@ -5735,7 +5735,7 @@ public:
         if (__right_ != 0)
             r += __right_->size();
         else if (__size_ != 0)
-            r += static_cast<size_t>(snprintf(0, 0, "%lu", static_cast<unsigned long>(__size_)));
+            r += static_cast<size_t>(snprintf(0, 0, "%ld", __size_));
         return r;
     }
 
@@ -5747,7 +5747,7 @@ public:
             buf = __right_->get_demangled_name(buf);
         else if (__size_ != 0)
         {
-            int off = sprintf(buf, "%lu", static_cast<unsigned long>(__size_));
+            int off = sprintf(buf, "%ld", __size_);
             buf += off;
         }
         char* t = buf;