diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/lib/libcxxabi/symbols | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/lib/libcxxabi/symbols')
| -rw-r--r-- | system/lib/libcxxabi/symbols | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/lib/libcxxabi/symbols b/system/lib/libcxxabi/symbols index a02a6411..f2925e4c 100644 --- a/system/lib/libcxxabi/symbols +++ b/system/lib/libcxxabi/symbols @@ -31,7 +31,6 @@ T _ZN10__cxxabiv129__pointer_to_member_type_infoD0Ev T _ZN10__cxxabiv129__pointer_to_member_type_infoD1Ev T _ZN10__cxxabiv129__pointer_to_member_type_infoD2Ev - C _ZN10__cxxabiv18is_equalEPKSt9type_infoS2_b T _ZNK10__cxxabiv116__enum_type_info9can_catchEPKNS_16__shim_type_infoERPv T _ZNK10__cxxabiv116__shim_type_info5noop1Ev T _ZNK10__cxxabiv116__shim_type_info5noop2Ev @@ -127,6 +126,7 @@ D _ZTIPy D _ZTISt10bad_typeid D _ZTISt8bad_cast + C _ZTISt9exception D _ZTISt9type_info D _ZTIa D _ZTIb @@ -201,6 +201,7 @@ D _ZTSPy D _ZTSSt10bad_typeid D _ZTSSt8bad_cast + C _ZTSSt9exception D _ZTSSt9type_info D _ZTSa D _ZTSb |