me/guix
Archived
1
0
Fork 0
Code Activity

Revert "daemon: Ensure proper alignment on the stack."

Browse source 
This reverts commit ab4ccc8fcf.
This commit is contained in:
Mark H Weaver 2017-08-05 01:57:25 -04:00
parent 1cec346232
commit 7656739771
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nix/libstore/build.cc
View file

@ -26,7 +26,6 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <cstring> #include <cstring>
#include <stdint.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
@ -2009,11 +2008,7 @@ void DerivationGoal::startBuilder()
char stack[32 * 1024]; char stack[32 * 1024];
int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD; int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
if (!fixedOutput) flags |= CLONE_NEWNET; if (!fixedOutput) flags |= CLONE_NEWNET;
pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
/* 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);
if (pid == -1) if (pid == -1)
throw SysError("cloning builder process"); throw SysError("cloning builder process");
} else } else