about summary refs log tree commit diff
path: root/src/rt
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-12-11 17:50:12 -0800
committerGraydon Hoare <graydon@mozilla.com>2011-12-12 16:15:29 -0800
commit887d970fee8f754747b60c795cdb341e76a8a692 (patch)
treeb9cc534cf53b9b1f9834021963186fed3aa3e013 /src/rt
parent3e32f6623cf89375ad5e07778da614d2b6300778 (diff)
downloadrust-887d970fee8f754747b60c795cdb341e76a8a692.tar.gz
rust-887d970fee8f754747b60c795cdb341e76a8a692.zip
rt: Make unwinding through __morestack work on mac
Had to bump the min stack size in some of the tests from 256 bytes
to 1024 bytes. Not sure why yet.
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/arch/x86_64/morestack.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rt/arch/x86_64/morestack.S b/src/rt/arch/x86_64/morestack.S
index c85f2e142db..80c77e8b1fc 100644
--- a/src/rt/arch/x86_64/morestack.S
+++ b/src/rt/arch/x86_64/morestack.S
@@ -73,13 +73,11 @@ MORESTACK:
 
 	// During unwinding we want to skip our caller since it's not
 	// a complete frame and will make the unwinder sad
-#if defined(__linux__)
 	// Don't understand this line
 	.cfi_offset 16, 0
 	// Tell the unwinding where to get the stack pointer for
 	// our grandparent frame
 	.cfi_offset %rsp, -24
-#endif
 
 	// Save the grandparent stack pointer for the unwinder
 	leaq 16(%rbp), %rax
@@ -162,4 +160,4 @@ MORESTACK:
 #else
 MORESTACK:
 	ret
-#endif
\ No newline at end of file
+#endif