Actually update to 1.2.2.

Author: sbc100

src/library_pthread.js

@@ -533,12 +533,8 @@ var LibraryPThread = {
       threadInfoStruct: threadParams.pthread_ptr
     };
     var tis = pthread.threadInfoStruct >> 2;
-    Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.threadStatus }}} >> 2), 0); // threadStatus <- 0, meaning not yet exited.
-    Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.threadExitCode }}} >> 2), 0); // threadExitCode <- 0.
-    Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.profilerBlock }}} >> 2), 0); // profilerBlock <- 0.
     Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.detach_state }}} >> 2), threadParams.detached);
     Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.tsd }}} >> 2), tlsMemory); // Init thread-local-storage memory array.
-    Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.tsd_used }}} >> 2), 0); // Mark initial status to unused.
     Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.tid }}} >> 2), pthread.threadInfoStruct); // Main thread ID.
 
     Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.stack_size }}} >> 2), threadParams.stackSize);

src/library_pthread_stub.js

@@ -17,21 +17,21 @@ var LibraryPThreadStub = {
 #endif
   },
 
-  _pthread_cleanup_push__sig: 'viii',
-  _pthread_cleanup_push: function(ptr, routine, arg) {
+  pthread_cleanup_push__sig: 'vii',
+  pthread_cleanup_push: function(routine, arg) {
     __ATEXIT__.push({ func: routine, arg: arg });
-    __pthread_cleanup_push.level = __ATEXIT__.length;
+    _pthread_cleanup_push.level = __ATEXIT__.length;
   },
 
-  _pthread_cleanup_pop__deps: ['_pthread_cleanup_push'],
-  _pthread_cleanup_pop__sig: 'vii',
-  _pthread_cleanup_pop: function(ptr, execute) {
-    assert(__pthread_cleanup_push.level == __ATEXIT__.length, 'cannot pop if something else added meanwhile!');
+  pthread_cleanup_pop__deps: ['pthread_cleanup_push'],
+  pthread_cleanup_pop__sig: 'vi',
+  pthread_cleanup_pop: function(execute) {
+    assert(_pthread_cleanup_push.level == __ATEXIT__.length, 'cannot pop if something else added meanwhile!');
     callback = __ATEXIT__.pop();
     if (execute) {
       {{{ makeDynCall('vi', 'callback.func') }}}(callback.arg)
     }
-    __pthread_cleanup_push.level = __ATEXIT__.length;
+    _pthread_cleanup_push.level = __ATEXIT__.length;
   },
 
   {{{ USE_LSAN || USE_ASAN ? 'emscripten_builtin_' : '' }}}pthread_create: function() {

src/library_syscall.js

@@ -25,20 +25,26 @@ var SyscallsLibrary = {
     umask: 0x1FF,  // S_IRWXU | S_IRWXG | S_IRWXO
 
     // shared utilities
-    calculateAt: function(dirfd, path) {
-      if (path[0] !== '/') {
-        // relative path
-        var dir;
-        if (dirfd === {{{ cDefine('AT_FDCWD') }}}) {
-          dir = FS.cwd();
-        } else {
-          var dirstream = FS.getStream(dirfd);
-          if (!dirstream) throw new FS.ErrnoError({{{ cDefine('EBADF') }}});
-          dir = dirstream.path;
+    calculateAt: function(dirfd, path, allowEmpty) {
+      if (path[0] === '/') {
+        return path;
+      }
+      // relative path
+      var dir;
+      if (dirfd === {{{ cDefine('AT_FDCWD') }}}) {
+        dir = FS.cwd();
+      } else {
+        var dirstream = FS.getStream(dirfd);
+        if (!dirstream) throw new FS.ErrnoError({{{ cDefine('EBADF') }}});
+        dir = dirstream.path;
+      }
+      if (path.length == 0) {
+        if (!allowEmpty) {
+          throw new FS.ErrnoError({{{ cDefine('ENOENT') }}});;
         }
-        path = PATH.join2(dir, path);
+        return dir;
       }
-      return path;
+      return PATH.join2(dir, path);
     },
 
     doStat: function(func, path, buf) {
@@ -1273,11 +1279,12 @@ var SyscallsLibrary = {
   __sys_fstatat64: function(dirfd, path, buf, flags) {
     path = SYSCALLS.getStr(path);
     var nofollow = flags & {{{ cDefine('AT_SYMLINK_NOFOLLOW') }}};
-    flags = flags & (~{{{ cDefine('AT_SYMLINK_NOFOLLOW') }}});
+    var allowEmpty = flags & {{{ cDefine('AT_EMPTY_PATH') }}};
+    flags = flags & (~{{{ cDefine('AT_SYMLINK_NOFOLLOW') | cDefine('AT_EMPTY_PATH') }}});
 #if ASSERTIONS
     assert(!flags, flags);
 #endif
-    path = SYSCALLS.calculateAt(dirfd, path);
+    path = SYSCALLS.calculateAt(dirfd, path, allowEmpty);
     return SYSCALLS.doStat(nofollow ? FS.lstat : FS.stat, path, buf);
   },
   __sys_unlinkat: function(dirfd, path, flags) {

src/struct_info.json

@@ -131,7 +131,8 @@
             "O_WRONLY",
             "AT_FDCWD",
             "AT_SYMLINK_NOFOLLOW",
-            "AT_REMOVEDIR"
+            "AT_REMOVEDIR",
+            "AT_EMPTY_PATH"
         ],
         "structs": {
             "flock": [

src/struct_info_internal.json

@@ -3,16 +3,15 @@
     // libc - internal
     // ===========================================
     {
-        "file": "system/lib/libc/musl/src/internal/pthread_impl.h",
+        "file": "pthread_impl.h",
         "structs": {
             "pthread": [
               "threadStatus",
               "threadExitCode",
               "profilerBlock",
               "self",
               "tsd",
-              "tsd_used",
-              "detached",
+              "detach_state",
               "stack",
               "stack_size",
               "attr",
@@ -26,7 +25,7 @@
         "defines": ["__ATTRP_C11_THREAD"]
     },
     {
-        "file": "system/lib/libc/musl/src/internal/libc.h",
+        "file": "libc.h",
         "structs": {
             "libc": [
               "global_locale"

system/lib/dlmalloc.c

@@ -856,6 +856,10 @@ extern "C" {
 #ifndef USE_DL_PREFIX
 // XXX Emscripten XXX
 #if defined(__EMSCRIPTEN__)
+void* __libc_malloc(size_t) __attribute__((weak, alias("dlmalloc")));
+void  __libc_free(void*) __attribute__((weak, alias("dlfree")));
+void* __libc_calloc(size_t) __attribute__((weak, alias("dlcalloc")));
+void* __libc_realloc(void*, size_t) __attribute__((weak, alias("dlrealloc")));
 void* malloc(size_t) __attribute__((weak, alias("dlmalloc")));
 void  free(void*) __attribute__((weak, alias("dlfree")));
 void* calloc(size_t, size_t) __attribute__((weak, alias("dlcalloc")));

system/lib/emmalloc.cpp

@@ -829,6 +829,7 @@ void *emmalloc_memalign(size_t alignment, size_t size)
   return ptr;
 }
 extern __typeof(emmalloc_memalign) emscripten_builtin_memalign __attribute__((alias("emmalloc_memalign")));
+extern __typeof(emmalloc_memalign) __libc_memalign __attribute__((alias("emmalloc_memalign")));
 
 void * EMMALLOC_EXPORT memalign(size_t alignment, size_t size)
 {
@@ -847,6 +848,7 @@ void *emmalloc_malloc(size_t size)
   return emmalloc_memalign(MALLOC_ALIGNMENT, size);
 }
 extern __typeof(emmalloc_malloc) emscripten_builtin_malloc __attribute__((alias("emmalloc_malloc")));
+extern __typeof(emmalloc_malloc) __libc_malloc __attribute__((alias("emmalloc_malloc")));
 
 void * EMMALLOC_EXPORT malloc(size_t size)
 {
@@ -948,6 +950,7 @@ void emmalloc_free(void *ptr)
 #endif
 }
 extern __typeof(emmalloc_free) emscripten_builtin_free __attribute__((alias("emmalloc_free")));
+extern __typeof(emmalloc_free) __libc_free __attribute__((alias("emmalloc_free")));
 
 void EMMALLOC_EXPORT free(void *ptr)
 {
@@ -1143,6 +1146,7 @@ void *emmalloc_realloc(void *ptr, size_t size)
 {
   return emmalloc_aligned_realloc(ptr, MALLOC_ALIGNMENT, size);
 }
+extern __typeof(emmalloc_realloc) __libc_realloc __attribute__((alias("emmalloc_realloc")));
 
 void * EMMALLOC_EXPORT realloc(void *ptr, size_t size)
 {
@@ -1178,6 +1182,7 @@ void *emmalloc_calloc(size_t num, size_t size)
     memset(ptr, 0, bytes);
   return ptr;
 }
+extern __typeof(emmalloc_calloc) __libc_calloc __attribute__((alias("emmalloc_calloc")));
 
 void * EMMALLOC_EXPORT calloc(size_t num, size_t size)
 {

system/lib/libc/emscripten_pthread.c

@@ -4,8 +4,8 @@
 
 #if !__EMSCRIPTEN_PTHREADS__
 static struct pthread __main_pthread;
-pthread_t __pthread_self(void) {
-  return &__main_pthread;
+uintptr_t __get_tp(void) {
+  return (uintptr_t)&__main_pthread;
 }
 
 __attribute__((constructor))

system/lib/libc/musl/INSTALL

@@ -86,7 +86,7 @@ and ABI combinations:
 
 * SuperH (SH)
     * Standard ELF ABI or FDPIC ABI (shared-text without MMU)
-    * Little-endian by default; big-engian variant also supported
+    * Little-endian by default; big-endian variant also supported
     * Full FPU ABI or soft-float ABI is supported, but the
       single-precision-only FPU ABI is not
 

system/lib/libc/musl/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2