about summary refs log tree commit diff
path: root/src/rt/arch
diff options
context:
space:
mode:
authorEric Holk <eholk@mozilla.com>2011-08-11 12:26:23 -0700
committerEric Holk <eholk@mozilla.com>2011-08-15 09:26:51 -0700
commita3320435610364457bf4ae08d1de64c3a96fca68 (patch)
tree726a4099c9063f600e51ad1a8861f5a73e104b0a /src/rt/arch
parentb2dad8af31d5d77e9e7da8561d87249fff216e80 (diff)
downloadrust-a3320435610364457bf4ae08d1de64c3a96fca68.tar.gz
rust-a3320435610364457bf4ae08d1de64c3a96fca68.zip
Updating to build on Linux and Mac, and hopefully Windows too.
Diffstat (limited to 'src/rt/arch')
-rw-r--r--src/rt/arch/i386/_context.S (renamed from src/rt/arch/i386/_context.s)4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rt/arch/i386/_context.s b/src/rt/arch/i386/_context.S
index d4c3fc436c6..5bd06d990dc 100644
--- a/src/rt/arch/i386/_context.s
+++ b/src/rt/arch/i386/_context.S
@@ -78,4 +78,8 @@ swap_registers:
 .globl task_trampoline
 task_trampoline:
     // This gets set up by std::task::_spawn.
+#ifdef __APPLE__
     call _task_exit
+#else
+    call task_exit
+#endif