Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You need a few things to run rustboot:
1. `qemu`
2. a cross-compiler for i386
3. `nasm`
4. Rust's `incoming` branch.
4. Rust's `master` branch or 0.7 release.

### OSX

Expand Down Expand Up @@ -45,7 +45,6 @@ To get edge Rust going, grab it from git:
```bash
$ git clone https://github.com/mozilla/rust
$ cd rust
$ git checkout incoming
$ ./configure --prefix=/Users/steve
$ make && make install
```
Expand Down
11 changes: 11 additions & 0 deletions linker.ld
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
ENTRY(start)
OUTPUT_FORMAT(binary)

MEMORY {
ram : org = 0x7e00, l = 12K
}

SECTIONS {
. = 0x7e00;

.text : {
runtime.o(.text)
*(.text)
} >ram

/DISCARD/ : {
*(.comment)
*(.eh_frame)
*(.rel.eh_frame)
}
}
Binary file added main
Binary file not shown.
3 changes: 3 additions & 0 deletions main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#[link(name = "rustboot",
vers = "0.0",
license = "MIT")];
#[allow(ctypes)];
#[no_std];
#[no_core];
Expand Down
2 changes: 2 additions & 0 deletions zero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ pub trait TyVisitor {}
#[lang="closure_exchange_malloc"]
pub trait ClosureExchangeMalloc {}

#[lang="vector_exchange_malloc"]

#[lang="send"]
pub trait Send {}

Expand Down