Move rust support to libports

Issue #1899
This commit is contained in:
Christian Helmuth
2016-05-12 10:26:36 +02:00
parent bb3e9300f6
commit 3ba61a2ddf
13 changed files with 7 additions and 7 deletions

View File

@ -147,7 +147,7 @@ $(LIB_A): $(OBJECTS)
$(MSG_MERGE)$(LIB_A) $(MSG_MERGE)$(LIB_A)
$(VERBOSE)$(RM) -f $@ $(VERBOSE)$(RM) -f $@
$(VERBOSE)$(AR) -rcs $@ $(OBJECTS) $(VERBOSE)$(AR) -rcs $@ $(OBJECTS)
# #
# Rename from object to rlib # Rename from object to rlib
# #
$(LIB_RLIB): $(OBJECTS) $(LIB_RLIB): $(OBJECTS)

View File

@ -1,5 +1,5 @@
LIBS = libcore-rust liblibc-rust LIBS = libcore-rust liblibc-rust
CC_RUSTC_OPT += --allow unused_features CC_RUSTC_OPT += --allow unused_features
RLIB = liballoc_genode RLIB = liballoc_genode
SRC_RS = lib.rs SRC_RS = lib.rs
vpath % $(REP_DIR)/src/lib/rust/$(RLIB) vpath % $(REP_DIR)/src/lib/rust/$(RLIB)

View File

@ -1,3 +1,3 @@
SRC_RS = lib.rs SRC_RS = lib.rs
LIBS = libcore-rust LIBS = libcore-rust
vpath % $(REP_DIR)/src/lib/rust/libunwind vpath % $(REP_DIR)/src/lib/rust/libunwind

View File

@ -12,13 +12,13 @@ install_config {
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</default-route> </default-route>
<start name="rust-test"> <start name="test-rust">
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="10M"/>
</start> </start>
</config> </config>
} }
build_boot_image "core init rust-test ld.lib.so libc.lib.so" build_boot_image "core init test-rust ld.lib.so libc.lib.so"
append qemu_args "-nographic -m 64" append qemu_args "-nographic -m 64"

View File

@ -5,7 +5,7 @@ macro_rules! dmb {
}} }}
} }
#[cfg(target_env = "armv6")] #[cfg(target_env = "armv6")]
macro_rules! dmb { macro_rules! dmb {
() => {{ () => {{
asm!("MCR p15,0,r0,c7,c10,4"); asm!("MCR p15,0,r0,c7,c10,4");

View File

@ -1,4 +1,4 @@
TARGET = rust-test TARGET = test-rust
SRC_RS = main.rs SRC_RS = main.rs
SRC_CC = printf.cc SRC_CC = printf.cc
LIBS = libcore-rust libcollections-rust base librustc_unicode-rust liballoc-rust liblibc-rust liballoc_system-rust LIBS = libcore-rust libcollections-rust base librustc_unicode-rust liballoc-rust liblibc-rust liballoc_system-rust