From 040bac6ad8104ce087784110ee43fc419bc03420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 23 Nov 2020 14:32:44 +0100
Subject: compile rust to static library

---
 halt/src/lib.rs  | 19 +++++++++++++++++++
 halt/src/main.rs | 26 --------------------------
 2 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100644 halt/src/lib.rs
 delete mode 100644 halt/src/main.rs

(limited to 'halt/src')

diff --git a/halt/src/lib.rs b/halt/src/lib.rs
new file mode 100644
index 0000000..43470b2
--- /dev/null
+++ b/halt/src/lib.rs
@@ -0,0 +1,19 @@
+#![no_std]
+//#![feature(asm)]
+//#![feature(link_args)]
+//#![link_args = "-L -lpintos"]
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn entry() {
+    exit(0x69);
+}
+
+#[link(name="pintos", kind="static")]
+extern {
+    fn exit(status: i32);
+}
diff --git a/halt/src/main.rs b/halt/src/main.rs
deleted file mode 100644
index 8abf38a..0000000
--- a/halt/src/main.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-#![no_std]
-#![no_main]
-#![feature(start)]
-//#![feature(asm)]
-//#![link_args = "-L -lmain"]
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn main() {
-    exit(0x69);
-}
-
-#[link(name="pintos", kind="static")]
-extern {
-    fn exit(status: i32);
-}
-
-//#[no_mangle]
-//#[start]
-//unsafe extern "C" fn _start() {
-//    exit(main());
-//}
-- 
cgit v1.2.1