---

yaml
---
r: 6767
b: refs/heads/master
c: ab4f35c
h: refs/heads/master
i:
  6765: 9a5da9f
  6763: e75cd48
  6759: b5a3483
  6751: 271d840
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 121c4201844c1bec4a8f2a4450e4b9330ee9bf28
+refs/heads/master: ab4f35c1f1247bd745378621a22340cbf8b7030d

trunk/src/rt/rust_upcall.cpp

@@ -19,8 +19,13 @@
 // correctly. Strategically placed at entry to upcalls because they begin on
 // the rust stack and happen frequently enough to catch most stack changes,
 // including at the beginning of all landing pads.
+// FIXME: Only seems to work on linux
+#ifdef __linux__
 extern "C" void
 check_stack_alignment() __attribute__ ((aligned (16)));
+#else
+static void check_stack_alignment() { }
+#endif
 
 #define SWITCH_STACK(A, F) upcall_call_shim_on_c_stack((void*)A, (void*)F)