---

yaml
---
r: 2331
b: refs/heads/master
c: 6871c24
h: refs/heads/master
i:
  2329: 1749d69
  2327: 998ddd9
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e43729ccf2577fad114107a336099da75eff0ded
+refs/heads/master: 6871c245a67fab222eccc2a21dcb620d11d3b0d0

trunk/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")) {
+        } else if (_str.eq(t, "llvm-intrinsic")) {
             abi = ast.native_abi_llvm;
         } else {
             p.err("unsupported abi: " + t);

trunk/src/comp/pretty/pprust.rs

@@ -229,6 +229,7 @@ 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");

trunk/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" mod llvm {
+native "llvm-intrinsic" mod llvm {
     fn sqrt(float n) -> float = "sqrt.f64";
 }