aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-02-20 16:58:18 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-02-20 16:58:18 -0800
commit5afd8a25d1a6f73f0089ae942246884b79ffb8ba (patch)
tree5bd6c32fa2156466a8d68a8e9841a3c4df48d389
parentdce46c9c2a9382070e81a2fd16747dea2c5c54c5 (diff)
remove bad_cast/typeinfo.cpp from libcxx, no longer needed since it is in libcxxabi
-rwxr-xr-xemcc2
-rw-r--r--system/lib/libcxx/symbols9
-rw-r--r--system/lib/libcxxabi/symbols6
3 files changed, 7 insertions, 10 deletions
diff --git a/emcc b/emcc
index 98edd68f..395bbda0 100755
--- a/emcc
+++ b/emcc
@@ -1017,7 +1017,7 @@ try:
def create_libcxx():
if DEBUG: print >> sys.stderr, 'emcc: building libcxx for cache'
os = []
- for src in ['algorithm.cpp', 'condition_variable.cpp', 'future.cpp', 'iostream.cpp', 'memory.cpp', 'random.cpp', 'stdexcept.cpp', 'system_error.cpp', 'utility.cpp', 'bind.cpp', 'debug.cpp', 'hash.cpp', 'mutex.cpp', 'string.cpp', 'thread.cpp', 'valarray.cpp', 'chrono.cpp', 'exception.cpp', 'ios.cpp', 'locale.cpp', 'regex.cpp', 'strstream.cpp', 'typeinfo.cpp']:
+ for src in ['algorithm.cpp', 'condition_variable.cpp', 'future.cpp', 'iostream.cpp', 'memory.cpp', 'random.cpp', 'stdexcept.cpp', 'system_error.cpp', 'utility.cpp', 'bind.cpp', 'debug.cpp', 'hash.cpp', 'mutex.cpp', 'string.cpp', 'thread.cpp', 'valarray.cpp', 'chrono.cpp', 'exception.cpp', 'ios.cpp', 'locale.cpp', 'regex.cpp', 'strstream.cpp']:
o = in_temp(src + '.o')
execute([shared.PYTHON, shared.EMXX, shared.path_from_root('system', 'lib', 'libcxx', src), '-o', o], stdout=stdout, stderr=stderr)
os.append(o)
diff --git a/system/lib/libcxx/symbols b/system/lib/libcxx/symbols
index 23d4a7a4..0d412de7 100644
--- a/system/lib/libcxx/symbols
+++ b/system/lib/libcxx/symbols
@@ -767,7 +767,6 @@
W _ZNKSt3__19money_putIwNS_19ostreambuf_iteratorIwNS_11char_traitsIwEEEEE3putES4_bRNS_8ios_baseEwe
W _ZNKSt3__19money_putIwNS_19ostreambuf_iteratorIwNS_11char_traitsIwEEEEE6do_putES4_bRNS_8ios_baseEwRKNS_12basic_stringIwS3_NS_9allocatorIwEEEE
W _ZNKSt3__19money_putIwNS_19ostreambuf_iteratorIwNS_11char_traitsIwEEEEE6do_putES4_bRNS_8ios_baseEwe
- T _ZNKSt8bad_cast4whatEv
T _ZNKSt9exception4whatEv
T _ZNSt10bad_typeidC1Ev
T _ZNSt10bad_typeidC2Ev
@@ -2561,11 +2560,6 @@
d _ZNSt3__1L7__wcoutE
d _ZNSt3__1L8__rs_mutE
W _ZNSt3__1plIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_12basic_stringIT_T0_T1_EEPKS6_RKS9_
- T _ZNSt8bad_castC1Ev
- T _ZNSt8bad_castC2Ev
- T _ZNSt8bad_castD0Ev
- T _ZNSt8bad_castD1Ev
- T _ZNSt8bad_castD2Ev
T _ZNSt9exceptionD0Ev
T _ZNSt9exceptionD1Ev
T _ZNSt9exceptionD2Ev
@@ -2719,7 +2713,6 @@
D _ZTISt15underflow_error
D _ZTISt16invalid_argument
D _ZTISt16nested_exception
- D _ZTISt8bad_cast
D _ZTISt9exception
C _ZTSNSt3__110__stdinbufIcEE
C _ZTSNSt3__110__stdinbufIwEE
@@ -2855,7 +2848,6 @@
D _ZTSSt15underflow_error
D _ZTSSt16invalid_argument
D _ZTSSt16nested_exception
- D _ZTSSt8bad_cast
D _ZTSSt9exception
D _ZTTNSt3__110istrstreamE
D _ZTTNSt3__110ostrstreamE
@@ -2980,7 +2972,6 @@
D _ZTVSt15underflow_error
D _ZTVSt16invalid_argument
D _ZTVSt16nested_exception
- D _ZTVSt8bad_cast
D _ZTVSt9exception
W _ZThn8_NKSt3__115time_get_bynameIcNS_19istreambuf_iteratorIcNS_11char_traitsIcEEEEE3__XEv
W _ZThn8_NKSt3__115time_get_bynameIcNS_19istreambuf_iteratorIcNS_11char_traitsIcEEEEE3__cEv
diff --git a/system/lib/libcxxabi/symbols b/system/lib/libcxxabi/symbols
index cc22a81b..b63f2f82 100644
--- a/system/lib/libcxxabi/symbols
+++ b/system/lib/libcxxabi/symbols
@@ -11,3 +11,9 @@
D _ZTVN10__cxxabiv123__fundamental_type_infoE
D _ZTVN10__cxxabiv129__pointer_to_member_type_infoE
D _ZTSSt9type_info
+ T _ZNKSt8bad_cast4whatEv
+ T _ZNSt8bad_castC1Ev
+ T _ZNSt8bad_castC2Ev
+ D _ZTISt8bad_cast
+ D _ZTSSt8bad_cast
+ D _ZTVSt8bad_cast