Commit 44a861c4 authored by qinsoon's avatar qinsoon

starts using rust 1.15 (remove redundant linkage that cause compilation

fail)
parent 99351616
Pipeline #304 failed with stage
in 34 minutes and 46 seconds
# This file is a template, and might need editing before it works on your project. # This file is a template, and might need editing before it works on your project.
# Unofficial language image. Look for the different tagged releases at: # Unofficial language image. Look for the different tagged releases at:
# https://hub.docker.com/r/scorpil/rust/tags/ # https://hub.docker.com/r/scorpil/rust/tags/
image: "qinsoon/ubuntu-zebu-test:v0.1" image: "qinsoon/ubuntu-zebu-test:lastest"
# Optional: Pick zero or more services to be used on all builds. # Optional: Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in. # Only needed when using a docker container to run your tests in.
......
extern crate gcc; extern crate gcc;
#[cfg(target_os = "macos")] #[cfg(any(target_os = "macos", target_os = "linux"))]
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
fn main() { fn main() {
gcc::compile_library("libruntime.a", &["src/runtime/runtime_x64_sysv.c"]); gcc::compile_library("libruntime.a", &["src/runtime/runtime_x64_sysv.c"]);
...@@ -8,14 +8,4 @@ fn main() { ...@@ -8,14 +8,4 @@ fn main() {
gcc::Config::new().flag("-O3").flag("-c") gcc::Config::new().flag("-O3").flag("-c")
.file("src/runtime/swap_stack_x64_sysv.S") .file("src/runtime/swap_stack_x64_sysv.S")
.compile("libswap_stack.a"); .compile("libswap_stack.a");
} }
\ No newline at end of file
#[cfg(target_os = "linux")]
#[cfg(target_arch = "x86_64")]
fn main() {
gcc::compile_library("libruntime.a", &["src/runtime/runtime_x64_sysv.c"]);
gcc::Config::new().flag("-O3").flag("-c")
.file("src/runtime/swap_stack_x64_sysv.S")
.compile("libswap_stack.a");
}
...@@ -8,9 +8,6 @@ void* malloc_zero(size_t size) { ...@@ -8,9 +8,6 @@ void* malloc_zero(size_t size) {
return ret; return ret;
} }
uintptr_t immmix_get_stack_ptr();
uintptr_t immmix_get_stack_ptr() { uintptr_t immmix_get_stack_ptr() {
uintptr_t rsp; uintptr_t rsp;
// get current rsp, rbp (this C func frame) // get current rsp, rbp (this C func frame)
......
...@@ -146,11 +146,7 @@ pub extern fn drop_mutator(mutator: *mut ImmixMutatorLocal) { ...@@ -146,11 +146,7 @@ pub extern fn drop_mutator(mutator: *mut ImmixMutatorLocal) {
// rust will reclaim the boxed mutator // rust will reclaim the boxed mutator
} }
#[cfg(target_arch = "x86_64")] pub use heap::gc::set_low_water_mark;
#[link(name = "gc_clib_x64")]
extern "C" {
pub fn set_low_water_mark();
}
// explicitly control roots // explicitly control roots
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment