diff options
| author | Marijn Haverbeke <[email protected]> | 2011-04-18 16:18:55 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <[email protected]> | 2011-04-18 16:21:49 +0200 |
| commit | f6be25a8705b40c2c5127b52479485d904d38b64 (patch) | |
| tree | dc569bf01f47e01e70c8820a7a6341ac229154dd /src/rt/rust_internal.h | |
| parent | Add a -c option. (diff) | |
| download | rust-f6be25a8705b40c2c5127b52479485d904d38b64.tar.xz rust-f6be25a8705b40c2c5127b52479485d904d38b64.zip | |
Update foregoing patches to leave rust_crate alone.
Apparently it can't live in the main binary, since on non-Linux
platforms, dynamics libs won't find symbols in the binary. This
removes the crate_map pointer from rust_crate again, and instead
passes it as an extra argument to rust_start. Rustboot doesn't pass
this argument, but supposedly that's okay as long as we don't actually
use it on that platform.
Diffstat (limited to 'src/rt/rust_internal.h')
| -rw-r--r-- | src/rt/rust_internal.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index 695fc21d..4a1f3e45 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -248,9 +248,6 @@ public: size_t n_libs; uintptr_t abi_tag; - // FIXME: not generated by rustboot, should only be accessed in crates - // generated by rustc. - void* crate_map; // Crates are immutable, constructed by the compiler. @@ -262,8 +259,6 @@ public: uintptr_t get_gc_glue() const; uintptr_t get_exit_task_glue() const; - void update_log_settings(char* settings) const; - struct mem_area { rust_dom *dom; |