about summary refs log tree commit diff
path: root/src/rt/rust.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-03-15 18:06:19 -0700
committerBrian Anderson <banderson@mozilla.com>2013-03-18 17:00:35 -0700
commit044703435ba7e1338456f7a83393eb2c6fecf238 (patch)
tree9edfdc6ab1ab28e4c7abcf3176b073bda939f88b /src/rt/rust.cpp
parenta882554a785152c74c96cee036d252b071ed5ce1 (diff)
downloadrust-044703435ba7e1338456f7a83393eb2c6fecf238.tar.gz
rust-044703435ba7e1338456f7a83393eb2c6fecf238.zip
Add a way to run the test suite with the new scheduler
TESTARGS=--newrt make check-stage1-rpass

Conflicts:
	src/rt/rustrt.def.in
Diffstat (limited to 'src/rt/rust.cpp')
-rw-r--r--src/rt/rust.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index d9ef6a52dbe..803da32cbc8 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -21,17 +21,6 @@
 
 void* global_crate_map = NULL;
 
-#ifndef _WIN32
-pthread_key_t sched_key;
-#else
-DWORD sched_key;
-#endif
-
-extern "C" void*
-rust_get_sched_tls_key() {
-    return &sched_key;
-}
-
 /**
    The runtime entrypoint. The (C ABI) main function generated by rustc calls
    `rust_start`, providing the address of the Rust ABI main function, the
@@ -41,10 +30,6 @@ rust_get_sched_tls_key() {
 extern "C" CDECL int
 rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
 
-#ifndef _WIN32
-    pthread_key_create(&sched_key, NULL);
-#endif
-
     // Load runtime configuration options from the environment.
     // FIXME #1497: Should provide a way to get these from the command
     // line as well.