move new.cpp from libc into libcxxabi

3 files changed, 47 insertions, 42 deletions

diff --git a/system/lib/libc.symbols b/system/lib/libc.symbols
index 90783d8d..2fc5e5c1 100644
--- a/system/lib/libc.symbols
+++ b/system/lib/libc.symbols
@@ -1,44 +1,3 @@
-         T _ZNKSt16bad_array_length4whatEv
-         T _ZNKSt20bad_array_new_length4whatEv
-         T _ZNKSt9bad_alloc4whatEv
-         T _ZNSt16bad_array_lengthC1Ev
-         T _ZNSt16bad_array_lengthC2Ev
-         T _ZNSt16bad_array_lengthD0Ev
-         T _ZNSt16bad_array_lengthD1Ev
-         T _ZNSt16bad_array_lengthD2Ev
-         T _ZNSt20bad_array_new_lengthC1Ev
-         T _ZNSt20bad_array_new_lengthC2Ev
-         T _ZNSt20bad_array_new_lengthD0Ev
-         T _ZNSt20bad_array_new_lengthD1Ev
-         T _ZNSt20bad_array_new_lengthD2Ev
-         T _ZNSt9bad_allocC1Ev
-         T _ZNSt9bad_allocC2Ev
-         T _ZNSt9bad_allocD0Ev
-         T _ZNSt9bad_allocD1Ev
-         T _ZNSt9bad_allocD2Ev
-         T _ZSt15get_new_handlerv
-         T _ZSt15set_new_handlerPFvvE
-         T _ZSt17__throw_bad_allocv
-         D _ZSt7nothrow
-         D _ZTISt16bad_array_length
-         D _ZTISt20bad_array_new_length
-         D _ZTISt9bad_alloc
-         C _ZTISt9exception
-         D _ZTSSt16bad_array_length
-         D _ZTSSt20bad_array_new_length
-         D _ZTSSt9bad_alloc
-         C _ZTSSt9exception
-         D _ZTVSt16bad_array_length
-         D _ZTVSt20bad_array_new_length
-         D _ZTVSt9bad_alloc
-         W _ZdaPv
-         W _ZdaPvRKSt9nothrow_t
-         W _ZdlPv
-         W _ZdlPvRKSt9nothrow_t
-         W _Znaj
-         W _ZnajRKSt9nothrow_t
-         W _Znwj
-         W _ZnwjRKSt9nothrow_t
          T __floatscan
          T __intscan
          T __overflow
diff --git a/system/lib/libcxxabi/symbols b/system/lib/libcxxabi/symbols
index 13d79901..95d8d666 100644
--- a/system/lib/libcxxabi/symbols
+++ b/system/lib/libcxxabi/symbols
@@ -236,3 +236,48 @@
          D _ZTVSt9type_info
          T __dynamic_cast
          T _ZNSt9exceptionD1Ev
+         T _ZSt15get_new_handlerv
+         T _ZNSt9bad_allocD1Ev
+         T _ZTISt9bad_alloc
+         T _ZNSt9bad_allocC1Ev
+         W _ZdaPv
+         W _ZdaPvRKSt9nothrow_t
+         W _ZdlPv
+         W _ZdlPvRKSt9nothrow_t
+         W _Znaj
+         W _ZnajRKSt9nothrow_t
+         W _Znwj
+         W _ZnwjRKSt9nothrow_t
+         T _ZNKSt16bad_array_length4whatEv
+         T _ZNKSt20bad_array_new_length4whatEv
+         T _ZNKSt9bad_alloc4whatEv
+         T _ZNSt16bad_array_lengthC1Ev
+         T _ZNSt16bad_array_lengthC2Ev
+         T _ZNSt16bad_array_lengthD0Ev
+         T _ZNSt16bad_array_lengthD1Ev
+         T _ZNSt16bad_array_lengthD2Ev
+         T _ZNSt20bad_array_new_lengthC1Ev
+         T _ZNSt20bad_array_new_lengthC2Ev
+         T _ZNSt20bad_array_new_lengthD0Ev
+         T _ZNSt20bad_array_new_lengthD1Ev
+         T _ZNSt20bad_array_new_lengthD2Ev
+         T _ZNSt9bad_allocC1Ev
+         T _ZNSt9bad_allocC2Ev
+         T _ZNSt9bad_allocD0Ev
+         T _ZNSt9bad_allocD1Ev
+         T _ZNSt9bad_allocD2Ev
+         T _ZSt15get_new_handlerv
+         T _ZSt15set_new_handlerPFvvE
+         T _ZSt17__throw_bad_allocv
+         D _ZSt7nothrow
+         D _ZTISt16bad_array_length
+         D _ZTISt20bad_array_new_length
+         D _ZTISt9bad_alloc
+         C _ZTISt9exception
+         D _ZTSSt16bad_array_length
+         D _ZTSSt20bad_array_new_length
+         D _ZTSSt9bad_alloc
+         C _ZTSSt9exception
+         D _ZTVSt16bad_array_length
+         D _ZTVSt20bad_array_new_length
+         D _ZTVSt9bad_alloc
diff --git a/tools/system_libs.py b/tools/system_libs.py
index e700ba83..8061a4f5 100644
--- a/tools/system_libs.py
+++ b/tools/system_libs.py
@@ -81,7 +81,6 @@ def calculate(temp_files, in_temp, stdout_, stderr_):
     logging.debug(' building libc for cache')
     libc_files = [
       'dlmalloc.c',
-      os.path.join('libcxx', 'new.cpp'),
     ]
     musl_files = [
       ['ctype', [
@@ -432,6 +431,7 @@ def calculate(temp_files, in_temp, stdout_, stderr_):
       'stdexcept.cpp',
       'typeinfo.cpp',
       'private_typeinfo.cpp',
+      os.path.join('..', '..', 'libcxx', 'new.cpp'),
     ]
     return build_libcxx(os.path.join('system', 'lib', 'libcxxabi', 'src'), 'libcxxabi.bc', libcxxabi_files)
 
@@ -508,6 +508,7 @@ def calculate(temp_files, in_temp, stdout_, stderr_):
       need = set()
       has = set()
       for symbols in symbolses:
+        if shared.Settings.VERBOSE: logging.debug('undefs: ' + str(symbols.undefs))
         for library_symbol in library_symbols:
           if library_symbol in symbols.undefs:
             need.add(library_symbol)