From eba74d74502641a4565dc6011db33742e8450680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Tue, 24 Nov 2020 15:08:20 +0100
Subject: move rust "libc" to separate crate and link with that instead

---
 libpintos-rs/Cargo.toml     | 16 ++++++++++++++++
 libpintos-rs/build.rs       |  4 ++++
 libpintos-rs/rust-toolchain |  1 +
 libpintos-rs/src/lib.rs     |  6 ++++++
 4 files changed, 27 insertions(+)
 create mode 100644 libpintos-rs/Cargo.toml
 create mode 100644 libpintos-rs/build.rs
 create mode 100644 libpintos-rs/rust-toolchain
 create mode 100644 libpintos-rs/src/lib.rs

(limited to 'libpintos-rs')

diff --git a/libpintos-rs/Cargo.toml b/libpintos-rs/Cargo.toml
new file mode 100644
index 0000000..e9293ad
--- /dev/null
+++ b/libpintos-rs/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "libpintos"
+version = "0.1.0"
+authors = ["Gustav Sörnäs <gustav@sornas.net>"]
+edition = "2018"
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"
+
+[dependencies.libc]
+version = "0.2"
+default-features = false
+features = ["extra_traits"]
diff --git a/libpintos-rs/build.rs b/libpintos-rs/build.rs
new file mode 100644
index 0000000..8b9cdb4
--- /dev/null
+++ b/libpintos-rs/build.rs
@@ -0,0 +1,4 @@
+fn main() {
+    println!("cargo:rustc-link-search=native=.");
+    println!("cargo:rustc-link-lib=static=pintos");
+}
diff --git a/libpintos-rs/rust-toolchain b/libpintos-rs/rust-toolchain
new file mode 100644
index 0000000..adfa491
--- /dev/null
+++ b/libpintos-rs/rust-toolchain
@@ -0,0 +1 @@
+nightly-i686-unknown-linux-gnu
diff --git a/libpintos-rs/src/lib.rs b/libpintos-rs/src/lib.rs
new file mode 100644
index 0000000..2ad4657
--- /dev/null
+++ b/libpintos-rs/src/lib.rs
@@ -0,0 +1,6 @@
+#![no_std]
+
+#[link(name="pintos", kind="static")]
+extern {
+    pub fn exit(status: i32);
+}
-- 
cgit v1.2.1