From 31ed845b7057b6f07450f15eaa877d5a1ae12ce1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sat, 5 Aug 2017 22:36:10 +0300
Subject: [PATCH] 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.
---
nix/libstore/build.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index c6615865be9..693fa70c8d5 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -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
--
GitLab