Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8

conflicts: tests/test_core.py tools/shared.py

117 files changed, 16913 insertions, 10057 deletions

diff --git a/emcc b/emcc
index ba927da5..4d6b8a73 100755
--- a/emcc
+++ b/emcc
@@ -1449,9 +1449,25 @@ try:
         os.path.join('libc', 'gen', 'verrx.c'),
         os.path.join('libc', 'gen', 'vwarn.c'),
         os.path.join('libc', 'gen', 'vwarnx.c'),
-        os.path.join('libc', 'stdlib', 'strtod.c'),
       ]
       musl_files = [
+        ['internal', [
+         'floatscan.c',
+         'shgetc.c',
+        ]],
+        ['math', [
+         'scalbn.c',
+         'scalbnl.c',
+        ]],
+        ['stdio', [
+         '__overflow.c',
+         '__toread.c',
+         '__uflow.c',
+        ]],
+        ['stdlib', [
+         'atof.c',
+         'strtod.c',
+        ]]
       ]
       for directory, sources in musl_files:
         libc_files += [os.path.join('libc', 'musl', 'src', directory, source) for source in sources]
@@ -1492,6 +1508,9 @@ try:
           'wctrans.c',
           'wcwidth.c',
          ]],
+         ['internal', [
+          'intscan.c',
+         ]],
          ['locale', [
           'iconv.c',
           'iswalnum_l.c',
@@ -1507,7 +1526,9 @@ try:
           'iswspace_l.c',
           'iswupper_l.c',
           'iswxdigit_l.c',
+          'strcasecmp_l.c',
           'strfmon.c',
+          'strncasecmp_l.c',
           'strxfrm.c',
           'towctrans_l.c',
           'towlower_l.c',
@@ -1519,6 +1540,29 @@ try:
           'wctrans_l.c',
           'wctype_l.c',
          ]],
+         ['math', [
+          '__cosdf.c',
+          '__sindf.c',
+          'ilogb.c',
+          'ilogbf.c',
+          'ilogbl.c',
+          'ldexp.c',
+          'ldexpf.c',
+          'ldexpl.c',
+          'logb.c',
+          'logbf.c',
+          'logbl.c',
+          'lgamma.c',
+          'lgamma_r.c',
+          'lgammaf.c',
+          'lgammaf_r.c',
+          'lgammal.c',
+          'scalbnf.c',
+          'signgam.c',
+          'tgamma.c',
+          'tgammaf.c',
+          'tgammal.c'
+         ]],
          ['multibyte', [
           'btowc.c',
           'mblen.c',
@@ -1554,8 +1598,20 @@ try:
            'ecvt.c',
            'fcvt.c',
            'gcvt.c',
+           'wcstod.c',
+           'wcstol.c',
          ]],
          ['string', [
+           'memccpy.c',
+           'memmem.c',
+           'mempcpy.c',
+           'memrchr.c',
+           'strcasestr.c',
+           'strchrnul.c',
+           'strlcat.c',
+           'strlcpy.c',
+           'strsep.c',
+           'strverscmp.c',
            'wcpcpy.c',
            'wcpncpy.c',
            'wcscasecmp.c',
diff --git a/src/jsifier.js b/src/jsifier.js
index a503e90d..726a5eda 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -215,6 +215,9 @@ function JSify(data, functionsOnly) {
 
   function parseConst(value, type, ident) {
     var constant = makeConst(value, type);
+    // Sadly, we've thrown away type information in makeConst, so we're not
+    // passing correct type info to parseNumerical which works around this
+    // lack.
     constant = flatten(constant).map(function(x) { return parseNumerical(x) })
     return constant;
   }
diff --git a/src/library.js b/src/library.js
index b1eb0be3..c41a8cda 100644
--- a/src/library.js
+++ b/src/library.js
@@ -4830,15 +4830,6 @@ LibraryManager.library = {
   llvm_log_f64: 'Math_log',
   llvm_exp_f32: 'Math_exp',
   llvm_exp_f64: 'Math_exp',
-  ldexp: function(x, exp_) {
-    return x * Math.pow(2, exp_);
-  },
-  ldexpf: 'ldexp',
-  scalb: 'ldexp',
-  scalbn: 'ldexp',
-  scalbnf: 'ldexp',
-  scalbln: 'ldexp',
-  scalblnf: 'ldexp',
   cbrt: function(x) {
     return Math.pow(x, 1/3);
   },
@@ -9193,7 +9184,7 @@ function autoAddDeps(object, name) {
 }
 
 // Add aborting stubs for various libc stuff needed by libc++
-['pthread_cond_signal', 'pthread_equal', 'wcstol', 'wcstoll', 'wcstoul', 'wcstoull', 'wcstof', 'wcstod', 'wcstold', 'pthread_join', 'pthread_detach', 'catgets', 'catopen', 'catclose', 'fputwc', '__lockfile', '__unlockfile'].forEach(function(aborter) {
+['pthread_cond_signal', 'pthread_equal', 'pthread_join', 'pthread_detach', 'catgets', 'catopen', 'catclose', 'fputwc', '__lockfile', '__unlockfile'].forEach(function(aborter) {
   LibraryManager.library[aborter] = function aborting_stub() { throw 'TODO: ' + aborter };
 });
 
diff --git a/src/parseTools.js b/src/parseTools.js
index 4d6d7bd3..b7f97a40 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -962,8 +962,13 @@ function parseNumerical(value, type) {
   }
   if (isNumber(value)) {
     var ret = parseFloat(value); // will change e.g. 5.000000e+01 to 50
+    // type may be undefined here, like when this is called from makeConst with a single argument.
+    // but if it is a number, then we can safely assume that this should handle negative zeros
+    // correctly.
+    if (type === undefined || type === 'double' || type === 'float') {
+      if (value[0] === '-' && ret === 0) { return '-.0'; } // fix negative 0, toString makes it 0
+    }
     if (type === 'double' || type === 'float') {
-      if (value[0] === '-' && ret === 0) return '-.0'; // fix negative 0, toString makes it 0
       if (!RUNNING_JS_OPTS) ret = asmEnsureFloat(ret, type);
     }
     return ret.toString();
diff --git a/system/include/libcxx/__config b/system/include/libcxx/__config
index a45b02de..45207392 100644
--- a/system/include/libcxx/__config
+++ b/system/include/libcxx/__config
@@ -174,7 +174,7 @@
 #endif
 
 #ifndef _LIBCPP_TYPE_VIS
-#  if __has_attribute(type_visibility)
+#  if __has_attribute(__type_visibility__)
 #    define _LIBCPP_TYPE_VIS __attribute__ ((__type_visibility__("default")))
 #  else
 #    define _LIBCPP_TYPE_VIS __attribute__ ((__visibility__("default")))
@@ -389,9 +389,7 @@ namespace std {
 #endif
 
 #if _GNUC_VER < 404
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
 #define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
 #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
 #define _LIBCPP_HAS_NO_UNICODE_CHARS
 #define _LIBCPP_HAS_NO_VARIADICS
@@ -402,6 +400,11 @@ namespace std {
 #define _LIBCPP_HAS_NO_NULLPTR
 #endif
 
+#if _GNUC_VER < 407
+#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
+#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
+#endif
+
 #endif  // __GXX_EXPERIMENTAL_CXX0X__
 
 #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { namespace _LIBCPP_NAMESPACE {
@@ -454,7 +457,6 @@ namespace std {
 #define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
 #define _LIBCPP_HAS_NO_NULLPTR
 #define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
 #define _LIBCPP_HAS_IS_BASE_OF
 
 #if defined(_AIX)
@@ -514,7 +516,7 @@ template <unsigned> struct __static_assert_check {};
 #define __has_feature(__x) 0
 #endif
 
-#if __has_feature(cxx_explicit_conversions)
+#if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__)
 #   define _LIBCPP_EXPLICIT explicit
 #else
 #   define _LIBCPP_EXPLICIT
@@ -567,6 +569,16 @@ template <unsigned> struct __static_assert_check {};
 #define _LIBCPP_WCTYPE_IS_MASK
 #endif
 
+#if defined(__APPLE__)
+#ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
+#  define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 0
+#endif
+#endif
+
+#ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
+#  define _LIBCPP