Revert "Rename the "llvm" API to "llvm-intrinsic"" due to tinderbox bustage

This reverts commit 6871c245a67fab222eccc2a21dcb620d11d3b0d0.

3 files changed, 2 insertions, 3 deletions

diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index 904efc2ea4e..b886e8ae8ed 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -2013,7 +2013,7 @@ fn parse_item_native_mod(parser p) -> @ast.item {
         if (_str.eq(t, "cdecl")) {
         } else if (_str.eq(t, "rust")) {
             abi = ast.native_abi_rust;
-        } else if (_str.eq(t, "llvm-intrinsic")) {
+        } else if (_str.eq(t, "llvm")) {
             abi = ast.native_abi_llvm;
         } else {
             p.err("unsupported abi: " + t);
diff --git a/src/comp/pretty/pprust.rs b/src/comp/pretty/pprust.rs
index 1f84e18ad8a..7ef91ce89e4 100644
--- a/src/comp/pretty/pprust.rs
+++ b/src/comp/pretty/pprust.rs
@@ -229,7 +229,6 @@ fn print_item(ps s, @ast.item item) {
             wrd1(s, "native");
             alt (nmod.abi) {
                 case (ast.native_abi_rust) {wrd1(s, "\"rust\"");}
-                case (ast.native_abi_llvm) {wrd1(s, "\"llvm-intrinsic\"");}
                 case (ast.native_abi_cdecl) {wrd1(s, "\"cdecl\"");}
             }
             wrd1(s, "mod");
diff --git a/src/test/bench/shootout/nbody.rs b/src/test/bench/shootout/nbody.rs
index 505748a37c9..f2041c0e33d 100644
--- a/src/test/bench/shootout/nbody.rs
+++ b/src/test/bench/shootout/nbody.rs
@@ -2,7 +2,7 @@
 // based on:
 // http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
 
-native "llvm-intrinsic" mod llvm {
+native "llvm" mod llvm {
     fn sqrt(float n) -> float = "sqrt.f64";
 }