~ruther/guix-local

31ed845b7057b6f07450f15eaa877d5a1ae12ce1 — Efraim Flashner 8 years ago 9833bcf
daemon: On aarch64, use increments of 16 on the stack.

* nix/libstore/build.cc (DerivationGoal::startBuilder): When on aarch64,
when calling clone(), increment the stack by 16.
1 files changed, 5 insertions(+), 1 deletions(-)

M nix/libstore/build.cc
M nix/libstore/build.cc => nix/libstore/build.cc +5 -1
@@ 2008,7 2008,11 @@ void DerivationGoal::startBuilder()
	char stack[32 * 1024];
	int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
	if (!fixedOutput) flags |= CLONE_NEWNET;
	pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
#ifdef __aarch64__
	    pid = clone(childEntry, stack + sizeof(stack) - 16, flags, this);
#else
	    pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
#endif
	if (pid == -1)
	    throw SysError("cloning builder process");
    } else