Updates for latest ACC changes.

committer: mfx <mfx> 1058050328 +0000

src/stdcxx.cpp

@@ -26,12 +26,18 @@
  */
 
 
+#if 0 && defined(_MSC_VER) && (_MSC_VER >= 1300)
+#  define _Nomemory UNUSED_Nomemory
+#  include <xstddef>
+#  undef _Nomemory
+#endif
+
 //#define WANT_STL
 #include "conf.h"
 #include "stdcxx.h"
 
 
-#if 0
+#if 0 && defined(_MSC_VER) && (_MSC_VER >= 1300)
 #undef _Nomemory
 namespace std {
 void __cdecl _Nomemory() {
@@ -42,6 +48,20 @@ void __cdecl _Nomemory() {
 #endif
 
 
+#if 1 && defined(__linux__) && (ACC_CC_GNUC >= 0x030400)
+/* this is used by __gnu_cxx::__verbose_terminate_handler() */
+extern "C" {
+char * __attribute__((__weak__)) __cxa_demangle(const char *, char *, size_t *, int *);
+char *__cxa_demangle(const char *mangled_name, char *buf, size_t *n, int *status)
+{
+    UNUSED(mangled_name); UNUSED(buf); UNUSED(n);
+    if (status) *status = -1; /* memory_allocation_failure */
+    return NULL;
+}
+} /* extern "C" */
+#endif
+
+
 #ifdef WANT_STL
 
 #if defined(__GNUC__)