about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2012-03-23 12:52:53 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-03-23 12:52:53 +0100
commitca71e01bcedd56bf6343223da1ddf5adc8fe5fc2 (patch)
tree47154331d368099460606360aad54423f66b4f17 /src
parent52d618a99a56cf536a6ec70e7aea7824533d1edd (diff)
downloadrust-ca71e01bcedd56bf6343223da1ddf5adc8fe5fc2.tar.gz
rust-ca71e01bcedd56bf6343223da1ddf5adc8fe5fc2.zip
Interpret native mods with ABI rust-intrinsic as builtins
Diffstat (limited to 'src')
-rw-r--r--src/rustc/front/attr.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rustc/front/attr.rs b/src/rustc/front/attr.rs
index 8c991517d88..a3b4f33ecf1 100644
--- a/src/rustc/front/attr.rs
+++ b/src/rustc/front/attr.rs
@@ -237,10 +237,7 @@ fn native_abi(attrs: [ast::attribute]) -> either<str, ast::native_abi> {
       option::none {
         either::right(ast::native_abi_cdecl)
       }
-      option::some("rust-intrinsic") {
-        either::right(ast::native_abi_rust_intrinsic)
-      }
-      option::some("rust-builtin") {
+      option::some("rust-intrinsic") | option::some("rust-builtin") {
         either::right(ast::native_abi_rust_builtin)
       }
       option::some("cdecl") {