Loading...
src/dyldNew.cpp dyld-640.2 dyld-852.2
--- dyld/dyld-640.2/src/dyldNew.cpp
+++ dyld/dyld-852.2/src/dyldNew.cpp
@@ -31,7 +31,7 @@
 
 extern "C" void* __dso_handle;
 
-#include "dyld.h"
+#include "dyld2.h"
 #include "dyldLibSystemInterface.h"
 
 //
@@ -51,7 +51,10 @@
 	dyld_static_pool*	previousPool;
 	uint8_t*			current;
 	uint8_t*			end;
-	uint8_t				pool[1]; 
+
+    // libunwind, and probably others, need the pool to be 16-byte aligned as malloc guarantees that
+    __attribute__((__aligned__(16)))
+    uint8_t				pool[1];
 };
 
 // allocate initial pool independently of pool header to take less space on disk
@@ -68,6 +71,9 @@
 		return p;
 	}
 	else {
+        // keep allocations 16-byte aligned
+        size = ((size + 15) & -16);
+
 		if ( size > DYLD_POOL_CHUNK_SIZE ) {
 			dyld::log("dyld malloc overflow: size=%lu\n", size);
 			dyld::halt("dyld malloc overflow\n");