---

yaml
---
r: 15173
b: refs/heads/try
c: c141e7a
h: refs/heads/master
i:
  15171: 2f445e4
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 211d41948a9f5bb4e6f322cb8639e01439e13abf
+refs/heads/try: c141e7a068e3fbb1a5d24dcd000567b7731910bb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_internal.h

@@ -38,6 +38,11 @@ extern "C" {
 #include <pthread.h>
 #include <errno.h>
 #include <dirent.h>
+
+#define GCC_VERSION (__GNUC__ * 10000 \
+                     + __GNUC_MINOR__ * 100 \
+                     + __GNUC_PATCHLEVEL__)
+
 #else
 #error "Platform not supported."
 #endif

branches/try/src/rt/rust_kernel.cpp

@@ -3,11 +3,12 @@
 #define __STDC_LIMIT_MACROS 1
 #endif
 
-#include <vector>
 #include "rust_internal.h"
 #include "rust_util.h"
 #include "rust_scheduler.h"
 
+#include <vector>
+
 #define KLOG_(...)                              \
     KLOG(this, kern, __VA_ARGS__)
 #define KLOG_ERR_(field, ...)                   \

branches/try/src/rt/rust_upcall.cpp

@@ -34,7 +34,8 @@
 // the rust stack and happen frequently enough to catch most stack changes,
 // including at the beginning of all landing pads.
 // FIXME: Enable this for windows
-#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__
+#if (defined __linux__ || defined __APPLE__ || defined __FreeBSD__) \
+    && (defined(GCC_VERSION) && GCC_VERSION > 40300)
 extern "C" void
 check_stack_alignment() __attribute__ ((aligned (16)));
 #else

branches/try/src/rt/util/indexed_list.h

@@ -43,6 +43,7 @@ template<typename T> class indexed_list {
     }
     virtual int32_t remove(T* value);
     virtual T * operator[](int32_t index);
+    virtual ~indexed_list() {}
 };
 
 template<typename T> int32_t