resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp

Change-Id: I10e96f48dcd7134cf45a6d8406bf8b69f6593eba

41 files changed, 70 insertions, 45 deletions

diff --git a/8/sources/cxx-stl/gabi++/include/cxxabi.h b/8/sources/cxx-stl/gabi++/include/cxxabi.h
index 3bd8a58..516e6a8 100644
--- a/8/sources/cxx-stl/gabi++/include/cxxabi.h
+++ b/8/sources/cxx-stl/gabi++/include/cxxabi.h
@@ -31,8 +31,6 @@
 
 #include <typeinfo>
 
-namespace abi = __cxxabiv1;
-
 namespace __cxxabiv1
 {
   extern "C" void __cxa_pure_virtual();
@@ -179,5 +177,7 @@ namespace __cxxabiv1
   };
 }
 
+namespace abi = __cxxabiv1;
+
 #endif /* defined(__GABIXX_CXXABI_H__) */
 
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
index fa4afd0..ade7504 100755
--- a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
index 6315957..e087121 100644
--- a/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
index 9b204d9..733dd0e 100755
--- a/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
diff --git a/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
index ee46e78..9e2debb 100644
--- a/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
+++ b/8/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
diff --git a/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_shared.so
index 1ec4d28..2c234f5 100755
--- a/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_shared.so
+++ b/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_shared.so
diff --git a/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_static.a
index fa296f4..d5228d0 100644
--- a/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_static.a
+++ b/8/sources/cxx-stl/gabi++/libs/mips/libgabi++_static.a
diff --git a/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
index 57dd6ee..50910f1 100755
--- a/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
+++ b/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
diff --git a/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
index b5e6877..d4cf676 100644
--- a/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
+++ b/8/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/include/typeinfo b/8/sources/cxx-stl/gnu-libstdc++/include/typeinfo
index eea38e7..f7f9d4e 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/include/typeinfo
+++ b/8/sources/cxx-stl/gnu-libstdc++/include/typeinfo
@@ -43,32 +43,29 @@ namespace __cxxabiv1
 } // namespace __cxxabiv1
 
 // Determine whether typeinfo names for the same type are merged (in which
-// case comparison can just compare pointers) or not (in which case
-// strings must be compared and g++.dg/abi/local1.C will fail), and
-// whether comparison is to be implemented inline or not.  By default we
-// use inline pointer comparison if weak symbols are available, and
-// out-of-line strcmp if not.  Out-of-line pointer comparison is used
-// where the object files are to be portable to multiple systems, some of
-// which may not be able to use pointer comparison, but the particular
-// system for which libstdc++ is being built can use pointer comparison;
-// in particular for most ARM EABI systems, where the ABI specifies
-// out-of-line comparison.  Inline strcmp is not currently supported.  The
-// compiler's target configuration can override the defaults by defining
-// __GXX_TYPEINFO_EQUALITY_INLINE to 1 or 0 to indicate whether or not
-// comparison is inline, and __GXX_MERGED_TYPEINFO_NAMES to 1 or 0 to
-// indicate whether or not pointer comparison can be used.
+// case comparison can just compare pointers) or not (in which case strings
+// must be compared), and whether comparison is to be implemented inline or
+// not.  We used to do inline pointer comparison by default if weak symbols
+// are available, but even with weak symbols sometimes names are not merged
+// when objects are loaded with RTLD_LOCAL, so now we always use strcmp by
+// default.  For ABI compatibility, we do the strcmp inline if weak symbols
+// are available, and out-of-line if not.  Out-of-line pointer comparison
+// is used where the object files are to be portable to multiple systems,
+// some of which may not be able to use pointer comparison, but the
+// particular system for which libstdc++ is being built can use pointer
+// comparison; in particular for most ARM EABI systems, where the ABI
+// specifies out-of-line comparison.  The compiler's target configuration
+// can override the defaults by defining __GXX_TYPEINFO_EQUALITY_INLINE to
+// 1 or 0 to indicate whether or not comparison is inline, and
+// __GXX_MERGED_TYPEINFO_NAMES to 1 or 0 to indicate whether or not pointer
+// comparison can be used.
 
 #ifndef __GXX_MERGED_TYPEINFO_NAMES
-  #if !__GXX_WEAK__
-    // If weak symbols are not supported, typeinfo names are not merged.
-    #define __GXX_MERGED_TYPEINFO_NAMES 0
-  #else
-    // On platforms that support weak symbols, typeinfo names are merged.
-    #define __GXX_MERGED_TYPEINFO_NAMES 1
-  #endif
+// By default, typeinfo names are not merged.
+#define __GXX_MERGED_TYPEINFO_NAMES 0
 #endif
 
-// By default follow the same rules as for __GXX_MERGED_TYPEINFO_NAMES.
+// By default follow the old inline rules to avoid ABI changes.
 #ifndef __GXX_TYPEINFO_EQUALITY_INLINE
   #if !__GXX_WEAK__
     #define __GXX_TYPEINFO_EQUALITY_INLINE 0
@@ -97,28 +94,41 @@ namespace std
     /** Returns an @e implementation-defined byte string; this is not
      *  portable between compilers!  */
     const char* name() const
-    { return __name; }
+    { return __name[0] == '*' ? __name + 1 : __name; }
 
 #if !__GXX_TYPEINFO_EQUALITY_INLINE
-    bool before(const type_info& __arg) const;
-
     // In old abi, or when weak symbols are not supported, there can
     // be multiple instances of a type_info object for one
     // type. Uniqueness must use the _name value, not object address.
+    bool before(const type_info& __arg) const;
     bool operator==(const type_info& __arg) const;
 #else
   #if !__GXX_MERGED_TYPEINFO_NAMES
-    #error "Inline implementation of type_info comparision requires merging of type_info objects"
-  #endif
     /** Returns true if @c *this precedes @c __arg in the implementation's
      *  collation order.  */
-    // In new abi we can rely on type_info's NTBS being unique,
+    // Even with the new abi, on systems that support dlopen
+    // we can run into cases where type_info names aren't merged,
+    // so we still need to do string comparison.
+    bool before(const type_info& __arg) const
+    { return (__name[0] == '*' && __arg.__name[0] == '*')
+	? __name < __arg.__name
+	: __builtin_strcmp (__name, __arg.__name) < 0; }
+
+    bool operator==(const type_info& __arg) const
+    {
+      return ((__name == __arg.__name)
+	      || (__name[0] != '*' &&
+		  __builtin_strcmp (__name, __arg.__name) == 0));
+    }
+  #else
+    // On some targets we can rely on type_info's NTBS being unique,
     // and therefore address comparisons are sufficient.
     bool before(const type_info& __arg) const
     { return __name < __arg.__name; }
 
     bool operator==(const type_info& __arg) const
     { return __name == __arg.__name; }
+  #endif
 #endif
     bool operator!=(const type_info& __arg) const
     { return !operator==(__arg); }
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include/bits/c++config.h b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include/bits/c++config.h
index 7611fc3..cb3187f 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include/bits/c++config.h
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include/bits/c++config.h
@@ -1055,11 +1055,11 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_INTTYPES_TR1 */
+#define _GLIBCXX_USE_C99_INTTYPES_TR1 1
 
 /* Define if wchar_t C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
@@ -1075,7 +1075,7 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 types in <stdint.h> should be imported in <tr1/cstdint> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_STDINT_TR1 */
+#define _GLIBCXX_USE_C99_STDINT_TR1 1
 
 /* Defined if clock_gettime has monotonic clock support. */
 /* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
index 393d881..264dbd3 100755
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
index 7462204..29103d8 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
index fff7031..958eafb 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include/bits/c++config.h b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include/bits/c++config.h
index 7611fc3..cb3187f 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include/bits/c++config.h
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include/bits/c++config.h
@@ -1055,11 +1055,11 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_INTTYPES_TR1 */
+#define _GLIBCXX_USE_C99_INTTYPES_TR1 1
 
 /* Define if wchar_t C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
@@ -1075,7 +1075,7 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 types in <stdint.h> should be imported in <tr1/cstdint> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_STDINT_TR1 */
+#define _GLIBCXX_USE_C99_STDINT_TR1 1
 
 /* Defined if clock_gettime has monotonic clock support. */
 /* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
index 59cde59..6a41397 100755
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
index 58e6842..d62c76e 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
index 176296d..00cb1f3 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/include/bits/c++config.h b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/include/bits/c++config.h
index 8bd4ebb..fe3ad0d 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/include/bits/c++config.h
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/include/bits/c++config.h
@@ -430,7 +430,7 @@ _GLIBCXX_END_NAMESPACE
 /* #undef _GLIBCXX_HAVE_FABSL */
 
 /* Define to 1 if you have the <fenv.h> header file. */
-/* #undef _GLIBCXX_HAVE_FENV_H */
+#define _GLIBCXX_HAVE_FENV_H 1
 
 /* Define to 1 if you have the `finite' function. */
 /* #undef _GLIBCXX_HAVE_FINITE */
@@ -1055,11 +1055,11 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_INTTYPES_TR1 */
+#define _GLIBCXX_USE_C99_INTTYPES_TR1 1
 
 /* Define if wchar_t C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
@@ -1075,7 +1075,7 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 types in <stdint.h> should be imported in <tr1/cstdint> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_STDINT_TR1 */
+#define _GLIBCXX_USE_C99_STDINT_TR1 1
 
 /* Defined if clock_gettime has monotonic clock support. */
 /* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_shared.so b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_shared.so
index 46807eb..d017b77 100755
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_shared.so
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_shared.so
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_static.a b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_static.a
index f3f737a..05edac3 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_static.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libgnustl_static.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libsupc++.a b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libsupc++.a
index c10e7ae..cb1500d 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libsupc++.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/mips/libsupc++.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/include/bits/c++config.h b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/include/bits/c++config.h
index 9fa61a5..ff17f9d 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/include/bits/c++config.h
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/include/bits/c++config.h
@@ -1059,7 +1059,7 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_INTTYPES_TR1 */
+#define _GLIBCXX_USE_C99_INTTYPES_TR1 1
 
 /* Define if wchar_t C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
@@ -1075,7 +1075,7 @@ _GLIBCXX_END_NAMESPACE
 
 /* Define if C99 types in <stdint.h> should be imported in <tr1/cstdint> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_STDINT_TR1 */
+#define _GLIBCXX_USE_C99_STDINT_TR1 1
 
 /* Defined if clock_gettime has monotonic clock support. */
 /* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
index ae987f9..36fbd82 100755
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
index 9720591..201e36b 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
diff --git a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
index 37f0c34..a481ab8 100644
--- a/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
+++ b/8/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
index 97bfafc..aa51ada 100755
--- a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
+++ b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
index 9757760..95f08f2 100644
--- a/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
+++ b/8/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
index 80bdcd3..9a5f157 100755
--- a/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
+++ b/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
diff --git a/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
index 80eadc0..c493321 100644
--- a/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
+++ b/8/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
diff --git a/8/sources/cxx-stl/stlport/libs/mips/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/mips/libstlport_shared.so
index bdbaaa8..52b47ba 100755
--- a/8/sources/cxx-stl/stlport/libs/mips/libstlport_shared.so
+++ b/8/sources/cxx-stl/stlport/libs/mips/libstlport_shared.so
diff --git a/8/sources/cxx-stl/stlport/libs/mips/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/mips/libstlport_static.a
index 28c2524..c9a0561 100644
--- a/8/sources/cxx-stl/stlport/libs/mips/libstlport_static.a
+++ b/8/sources/cxx-stl/stlport/libs/mips/libstlport_static.a
diff --git a/8/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
index fa109eb..bd40203 100755
--- a/8/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
+++ b/8/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
diff --git a/8/sources/cxx-stl/stlport/libs/x86/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
index 2575cc0..9de8cf3 100644
--- a/8/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
+++ b/8/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_cmath.h b/8/sources/cxx-stl/stlport/stlport/stl/_cmath.h
index 5cb0cd5..771c27d 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_cmath.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_cmath.h
@@ -205,7 +205,7 @@ double functions but cast the arguments and return values to the given type. */
 
 /** rough characterization of compiler and native C library
 For the compiler, it can either support long double or not. If it doesn't, the
-macro _STLP_NO_LONG_DOUBLE is not defined and we don't define any long double
+macro _STLP_NO_LONG_DOUBLE is defined and we don't define any long double
 overloads.
 For the native C library the question is whether it has variants with an 'f'
 suffix (for float as opposed to double) or an 'l' suffix (for long double). If
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_exception.h b/8/sources/cxx-stl/stlport/stlport/stl/_exception.h
index a0bf4ad..1dd7127 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_exception.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_exception.h
@@ -185,8 +185,11 @@ public:
 #  endif
 };
 
+#ifdef _STLP_USE_EXCEPTIONS
 // forward declaration
 class __Named_exception;
+#endif
+
 _STLP_END_NAMESPACE
 #endif
 
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_ios_base.h b/8/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
index c9e10ad..8c7a65b 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_ios_base.h
@@ -48,11 +48,13 @@ _STLP_BEGIN_NAMESPACE
 class _STLP_CLASS_DECLSPEC ios_base {
 public:
 
+# ifdef _STLP_USE_EXCEPTIONS
   class _STLP_CLASS_DECLSPEC failure : public __Named_exception {
   public:
     explicit failure(const string&);
     virtual ~failure() _STLP_NOTHROW_INHERENTLY;
   };
+#endif
 
   typedef int fmtflags;
   typedef int iostate;
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_rope.h b/8/sources/cxx-stl/stlport/stlport/stl/_rope.h
index f100f67..8799a63 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_rope.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_rope.h
@@ -905,7 +905,9 @@ public:
   }
   reference operator*() {
     if (0 == this->_M_buf_ptr)
-#if !defined (__DMC__)
+#if defined(__clang__)
+      this->_S_setcache(*this);
+#elif !defined (__DMC__)
       _S_setcache(*this);
 #else
     { _Rope_iterator_base<_CharT, _Alloc>* __x = this; _S_setcache(*__x); }
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept.h b/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept.h
index 7b53551..ac24160 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept.h
@@ -25,6 +25,8 @@
 
 #if !defined (_STLP_USE_NATIVE_STDEXCEPT) || defined (_STLP_USE_OWN_NAMESPACE)
 
+#  if defined(_STLP_USE_EXCEPTIONS)
+
 _STLP_BEGIN_NAMESPACE
 
 class _STLP_CLASS_DECLSPEC logic_error : public __Named_exception {
@@ -101,6 +103,7 @@ public:
 
 _STLP_END_NAMESPACE
 
+#  endif /* _STLP_USE_EXCEPTIONS */
 #endif
 
 #endif /* _STLP_INTERNAL_STDEXCEPT */
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept_base.h b/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept_base.h
index 638e3fc..bac2c17 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept_base.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/_stdexcept_base.h
@@ -25,6 +25,8 @@
 #    include <stl/_exception.h>
 #  endif
 
+#  if defined(_STLP_USE_EXCEPTIONS)
+
 #    ifndef _STLP_INTERNAL_CSTRING
 #      include <stl/_cstring.h>
 #    endif
@@ -89,6 +91,7 @@ private:
 
 _STLP_END_NAMESPACE
 
-#endif /* _STLP_STDEXCEPT_SEEN */
+#  endif /* _STLP_USE_EXCEPTIONS */
+#endif
 
 #endif /* _STLP_INTERNAL_STDEXCEPT_BASE */
diff --git a/8/sources/cxx-stl/stlport/stlport/stl/config/_android.h b/8/sources/cxx-stl/stlport/stlport/stl/config/_android.h
index 6cf08f2..f4ea391 100644
--- a/8/sources/cxx-stl/stlport/stlport/stl/config/_android.h
+++ b/8/sources/cxx-stl/stlport/stlport/stl/config/_android.h
@@ -70,7 +70,9 @@
 #define _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT 1
 #define _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT 1
 
+#ifndef _ANDROID_NDK_BLAZE_
 // Android does have include_next but it doesn't work well in our build system.
 #undef _STLP_HAS_INCLUDE_NEXT
+#endif
 
 #endif /* __stl_config__android_h */