diff options
| author | bors <bors@rust-lang.org> | 2013-12-08 10:31:32 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-08 10:31:32 -0800 |
| commit | af6010ca0bfc0abf3f9e184cc33b9821c8453916 (patch) | |
| tree | 02a0328c879faf6f575ec7e1fac0e2f6690a83dc /src | |
| parent | 49b751dda19af57a2545a67879dd217e601b84c6 (diff) | |
| parent | 70273bb1d673babf0c3c600214b0a29f35f5d50e (diff) | |
| download | rust-af6010ca0bfc0abf3f9e184cc33b9821c8453916.tar.gz rust-af6010ca0bfc0abf3f9e184cc33b9821c8453916.zip | |
auto merge of #10855 : alexcrichton/rust/snapshots, r=pcwalton
This transitions the snapshot dependency process to understand that our snapshots are now a single static binary rather than an array of files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/rust_upcall.c | 9 | ||||
| -rw-r--r-- | src/snapshots.txt | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/rt/rust_upcall.c b/src/rt/rust_upcall.c index 18b71fbb179..6a3e7b7513c 100644 --- a/src/rt/rust_upcall.c +++ b/src/rt/rust_upcall.c @@ -78,15 +78,6 @@ upcall_rust_personality(int version, return args.retval; } -// NOTE: remove after stage0 -// Landing pads need to call this to insert the -// correct limit into TLS. -// NB: This must run on the Rust stack because it -// needs to acquire the value of the stack pointer -void -upcall_reset_stack_limit() { -} - // // Local Variables: // mode: C++ diff --git a/src/snapshots.txt b/src/snapshots.txt index b9be50701d9..1a93b20c886 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2013-12-07 49b751d + freebsd-x86_64 b604a8c1846067756488d7d46f382328b35ae492 + linux-i386 e3c11032b19a74b86b5b6f271ee7457ce0b00d48 + linux-x86_64 e33ed8c5872144e0d3ba5785db700511766a4653 + macos-i386 4e4cca6d947c3984bd280a2c7606dd22db1b32f4 + macos-x86_64 492d28b86de14c8c359ab6dfbe7efc15f6305269 + winnt-i386 3075b0033433bd5449f27d0b6039e8ab939e27c2 + S 2013-12-04 9169579 freebsd-x86_64 0dc6dcd9435e23c891b9e9e37d483e92cfe51449 linux-i386 9802f6ba319bec4dd02299af08e421270ede5f5f |