about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2011-05-03 17:49:58 -0700
committerPatrick Walton <pcwalton@mimiga.net>2011-05-03 17:50:37 -0700
commit2bc17adc299ef0fcfbf7c41fc1ad12950ffd7e56 (patch)
treea743450c44cd8453080c8b55dd60bcdf0a399f2b /src/comp
parentb81897d7e40f2a8b227230e9494c1a6031c846f4 (diff)
downloadrust-2bc17adc299ef0fcfbf7c41fc1ad12950ffd7e56.tar.gz
rust-2bc17adc299ef0fcfbf7c41fc1ad12950ffd7e56.zip
Revert "Rename the "llvm" API to "llvm-intrinsic"" due to tinderbox bustage
This reverts commit 6871c245a67fab222eccc2a21dcb620d11d3b0d0.
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/front/parser.rs2
-rw-r--r--src/comp/pretty/pprust.rs1
2 files changed, 1 insertions, 2 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");