Remove last vestiges of old-style intrinsics

Closes #2048
rust-lang · Mar 23, 2012 · 1b81c51 · 1b81c51
1 parent 837478c
commit 1b81c51
Show file tree

Hide file tree

Showing 28 changed files with 37 additions and 981 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -317,7 +317,6 @@ HSREQ$(1)_H_$(3) = \
 TSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(HSREQ$(1)_H_$(3)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.bc \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
 
 # Prerequisites for complete stageN targets

diff --git a/mk/clean.mk b/mk/clean.mk
@@ -99,8 +99,6 @@ clean$(1)_T_$(2)_H_$(3):
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
-	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.bc
-	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.ll
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
 endef
 

diff --git a/mk/install.mk b/mk/install.mk
@@ -42,7 +42,6 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
 	$$(Q)$$(call INSTALL_LIB, \
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
-	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),intrinsics.bc)
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
 
 endef

diff --git a/mk/target.mk b/mk/target.mk
@@ -13,17 +13,6 @@ USE_SNAPSHOT_CORELIB=0
 
 define TARGET_STAGE_N
 
-$$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.ll: \
-		$$(S)src/rt/intrinsics/intrinsics.$(HOST_$(2)).ll.in
-	@$$(call E, sed: $$@)
-	$$(Q)sed s/@CFG_TARGET_TRIPLE@/$(2)/ $$< > $$@
-
-$$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.bc: \
-		$$(TLIB$(1)_T_$(2)_H_$(3))/intrinsics.ll \
-		$$(LLVM_CONFIG_$(2))
-	@$$(call E, llvms-as: $$@)
-	$$(Q)$$(LLVM_AS_$(2)) -o $$@ $$<
-
 $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
 		rt/$(2)/arch/$$(HOST_$(2))/libmorestack.a
 	@$$(call E, cp: $$@)

diff --git a/src/etc/gen-intrinsics b/src/etc/gen-intrinsics
diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
@@ -55,7 +55,7 @@ native mod rustrt {
                         yield: *libc::uintptr_t);
 }
 
-#[abi = "rust-builtin"]
+#[abi = "rust-intrinsic"]
 native mod rusti {
     fn init<T>() -> T;
 }

diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
@@ -19,7 +19,7 @@ native mod libc_ {
     fn memmove(dest: *c_void, src: *c_void, n: libc::size_t) -> *c_void;
 }
 
-#[abi = "rust-builtin"]
+#[abi = "rust-intrinsic"]
 native mod rusti {
     fn addr_of<T>(val: T) -> *T;
 }

diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs
@@ -28,7 +28,7 @@ native mod rustrt {
     fn rust_set_exit_status(code: libc::intptr_t);
 }
 
-#[abi = "rust-builtin"]
+#[abi = "rust-intrinsic"]
 native mod rusti {
     fn get_tydesc<T>() -> *();
     fn size_of<T>() -> uint;

diff --git a/src/libcore/unsafe.rs b/src/libcore/unsafe.rs
@@ -2,7 +2,7 @@
 
 export reinterpret_cast, forget;
 
-#[abi = "rust-builtin"]
+#[abi = "rust-intrinsic"]
 native mod rusti {
     fn forget<T>(-x: T);
     fn reinterpret_cast<T, U>(e: T) -> U;

diff --git a/src/rt/intrinsics/intrinsics.cpp b/src/rt/intrinsics/intrinsics.cpp