From c14a73158efa5bebf3748419107f66f81df29a8f Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 11 Jul 2013 20:11:26 +0200 Subject: [PATCH 1/4] Add vector_exchange_malloc lang item --- zero.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zero.rs b/zero.rs index 3bb16c3128..b8e4535801 100644 --- a/zero.rs +++ b/zero.rs @@ -58,6 +58,8 @@ pub trait TyVisitor {} #[lang="closure_exchange_malloc"] pub trait ClosureExchangeMalloc {} +#[lang="vector_exchange_malloc"] + #[lang="send"] pub trait Send {} From 2a8b23ed0bb5348ea519aabeb909344021f6e946 Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 11 Jul 2013 20:23:40 +0200 Subject: [PATCH 2/4] Remove information about Rust's incoming branch --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 881ba03798..4ff5ab769a 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 ``` From 8c99e2288ae8dde0bebcae05fe40dd13fc6e4e4c Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 11 Jul 2013 22:59:09 +0200 Subject: [PATCH 3/4] Add link attributes to suppress warnings --- main | Bin 0 -> 9793 bytes main.rs | 3 +++ 2 files changed, 3 insertions(+) create mode 100755 main diff --git a/main b/main new file mode 100755 index 0000000000000000000000000000000000000000..83687099e6a9902f41c89f68283a71038df2275d GIT binary patch literal 9793 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 literal 0 HcmV?d00001 diff --git a/main.rs b/main.rs index 565b21f4e0..925ab969a0 100644 --- a/main.rs +++ b/main.rs @@ -1,3 +1,6 @@ +#[link(name = "rustboot", + vers = "0.0", + license = "MIT")]; #[allow(ctypes)]; #[no_std]; #[no_core]; From 79c3c28a3299853e5be61964e528416a6d5466ad Mon Sep 17 00:00:00 2001 From: Piotr Date: Fri, 12 Jul 2013 15:03:49 +0200 Subject: [PATCH 4/4] Specify ram limit to prevent overflow --- linker.ld | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/linker.ld b/linker.ld index 0a7b087788..f5bebf8b23 100644 --- a/linker.ld +++ b/linker.ld @@ -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) } }