Merge remote-tracking branch 'upstream/master'

1 files changed, 8 insertions, 1 deletions

diff --git a/src/library.js b/src/library.js
index d6c727b9..bf1f28f8 100644
--- a/src/library.js
+++ b/src/library.js
@@ -802,7 +802,7 @@ var Library = {
   stat__deps: ['open', 'fstat'],
   stat: function(filename, ptr) {
     if (typeof window === 'undefined') {
-      // d8 hangs if you try to read a folder.
+      // XXX d8 hangs if you try to read a folder.
       // http://code.google.com/p/v8/issues/detail?id=1533
       return 0;
     }
@@ -2011,6 +2011,13 @@ var Library = {
     return ret + boundary - (ret % boundary);
   },
 
+  posix_memalign__deps: ['memalign'],
+  posix_memalign: function(memptr, alignment, size) {
+    var ptr = _memalign(alignment, size);
+    {{{ makeSetValue('memptr', '0', 'ptr', 'i8*') }}}
+    return 0;
+  },
+
   // ==========================================================================
   // dirent.h
   // ==========================================================================