From fd36e7b4aafbc7ac1630b67187bda2789cf21b1c Mon Sep 17 00:00:00 2001
From: TB Schardl <neboat@mit.edu>
Date: Thu, 2 Jul 2020 16:04:58 -0400
Subject: [PATCH] [cilkscale] Fix compilation of serial cilkscale tool, when
 cilkscale is built with a non-Cilk compiler

---
 compiler-rt/lib/cilkscale/shadow_stack.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/compiler-rt/lib/cilkscale/shadow_stack.h b/compiler-rt/lib/cilkscale/shadow_stack.h
index 74eabc0fad1d..e9d356abcb71 100644
--- a/compiler-rt/lib/cilkscale/shadow_stack.h
+++ b/compiler-rt/lib/cilkscale/shadow_stack.h
@@ -3,7 +3,14 @@
 #define INCLUDED_SHADOW_STACK_H
 
 #include "cilkscale_timer.h"
+
+#ifndef SERIAL_TOOL
+#define SERIAL_TOOL 1
+#endif
+
+#if !SERIAL_TOOL
 #include <cilk/reducer.h>
+#endif
 
 #ifndef DEFAULT_STACK_SIZE
 #define DEFAULT_STACK_SIZE 64
@@ -94,12 +101,14 @@ struct shadow_stack_t {
         bot(std::move(move.bot))
   {}
 
+#if !SERIAL_TOOL
   // Move-in constructor
   shadow_stack_t(cilk::move_in_wrapper<shadow_stack_t> w) {
     capacity = w.value().capacity;
     frames = w.value().frames;
     bot = w.value().bot;
   }
+#endif
 
   ~shadow_stack_t() {
     if (frames)