From 7656739771b0e07e467af709c730fee85bf65821 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sat, 5 Aug 2017 01:57:25 -0400
Subject: Revert "daemon: Ensure proper alignment on the stack."

This reverts commit ab4ccc8fcfaf2215d4b33b1376147e4c2c70426a.
---
 nix/libstore/build.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'nix')

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index a93095dd1e..c6615865be 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <cstring>
-#include <stdint.h>
 
 #include <pwd.h>
 #include <grp.h>
@@ -2009,11 +2008,7 @@ void DerivationGoal::startBuilder()
 	char stack[32 * 1024];
 	int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
 	if (!fixedOutput) flags |= CLONE_NEWNET;
-
-	/* Ensure proper alignment on the stack.  On aarch64, it has to be 16
-	   bytes.  */
-	pid = clone(childEntry, (char *)(((uintptr_t)stack + 16) & ~0xf),
-		    flags, this);
+	pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
 	if (pid == -1)
 	    throw SysError("cloning builder process");
     } else
-- 
cgit v1.2.3