[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "daemon: Ensure proper alignment on the stack."
From: |
Mark H. Weaver |
Subject: |
01/01: Revert "daemon: Ensure proper alignment on the stack." |
Date: |
Sat, 5 Aug 2017 02:00:07 -0400 (EDT) |
mhw pushed a commit to branch master
in repository guix.
commit 7656739771b0e07e467af709c730fee85bf65821
Author: Mark H Weaver <address@hidden>
Date: Sat Aug 5 01:57:25 2017 -0400
Revert "daemon: Ensure proper alignment on the stack."
This reverts commit ab4ccc8fcfaf2215d4b33b1376147e4c2c70426a.
---
nix/libstore/build.cc | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index a93095d..c661586 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