1 files changed, 6 insertions(+), 5 deletions(-)

M nix/libstore/build.cc

@@ 26,6 26,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <cstring>
+#include <stdint.h>
 
 #include <pwd.h>
 #include <grp.h>


@@ 2008,11 2009,11 @@ void DerivationGoal::startBuilder()
 	char stack[32 * 1024];
 	int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
 	if (!fixedOutput) flags |= CLONE_NEWNET;
-#ifdef __aarch64__
-	    pid = clone(childEntry, stack + sizeof(stack) - 16, flags, this);
-#else
-	    pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
-#endif
+	/* Ensure proper alignment on the stack.  On aarch64, it has to be 16
+	   bytes.  */
+	pid = clone(childEntry,
+		    (char *)(((uintptr_t)stack + sizeof(stack) - 8) & ~(uintptr_t)0xf),
+		    flags, this);
 	if (pid == -1)
 	    throw SysError("cloning builder process");
     } else