Switch to rustc-builtins instead of compiler-rt.rs.

Author: thejpster

libs/primer/Cargo.toml

@@ -14,8 +14,8 @@ version = "0.2.0"
 linked_list_allocator = "^0.2"
 spin = "^0.4"
 
-[dependencies.compiler-rt]
-git = "https://github.com/thejpster/compiler-rt.rs"
+[dependencies.rustc_builtins]
+git = "https://github.com/japaric/rustc-builtins.git"
 
 [dependencies.lazy_static]
 features = ["spin_no_std"]

libs/primer/src/common/builtins.rs

@@ -72,78 +72,6 @@ pub extern "C" fn _Unwind_Resume() -> ! {
 #[lang="eh_personality"]
 extern "C" fn eh_personality() {}
 
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memclr8(s: *mut u8, n: usize) -> *mut u8 {
-    rlibc::memset(s, 0, n)
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memclr4(s: *mut u8, n: usize) -> *mut u8 {
-    rlibc::memset(s, 0, n)
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memclr(s: *mut u8, n: usize) -> *mut u8 {
-    rlibc::memset(s, 0, n)
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memmove8(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memmove(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memmove4(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memmove(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memmove(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memmove(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memcpy8(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memcpy(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memcpy4(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memcpy(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *mut u8, n: usize) {
-    rlibc::memcpy(dest, src, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memset8(dest: *mut u8, n: usize, c: i32) {
-    rlibc::memset(dest, c, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memset4(dest: *mut u8, n: usize, c: i32) {
-    rlibc::memset(dest, c, n);
-}
-
-/// Required by LLVM ... sometimes
-#[no_mangle]
-pub unsafe extern "aapcs" fn __aeabi_memset(dest: *mut u8, n: usize, c: i32) {
-    rlibc::memset(dest, c, n);
-}
-
 /// Entry point of panic from the libcore crate.
 ///
 /// Required by the compiler.

libs/primer/src/lib.rs

@@ -25,6 +25,7 @@ pub mod common;
 extern crate spin;
 extern crate rlibc;
 extern crate linked_list_allocator;
+extern crate rustc_builtins;
 #[macro_use] extern crate lazy_static;
 
 pub use lm4f120h5qr::systick::delay;

lm4f120.json

@@ -11,7 +11,7 @@
     "target-endian": "little",
     "target-pointer-width": "32",
     "linker": "arm-none-eabi-gcc",
-    "no-compiler-rt": false,
+    "no-compiler-rt": true,
     "pre-link-args": [
         "-mcpu=cortex-m4", "-mthumb",
         "-Tlm4f120.ld"