diff options
| author | bors <bors@rust-lang.org> | 2013-03-30 22:06:41 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-30 22:06:41 -0700 |
| commit | 75d615d6f6d8fd8e931689106dfa22e4a6e662a2 (patch) | |
| tree | f2b4c6ebaff772b733c3b691bd02f35f242cec8b /src/libsyntax | |
| parent | 042a66514d9e8e373d95e8027187d86bb3418cef (diff) | |
| parent | 02700e0e8d77ce7cd0e606088cdc17b293a00fd6 (diff) | |
| download | rust-75d615d6f6d8fd8e931689106dfa22e4a6e662a2.tar.gz rust-75d615d6f6d8fd8e931689106dfa22e4a6e662a2.zip | |
auto merge of #5637 : luqmana/rust/5423, r=brson
Fixes #5423.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/abi.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs index 076c09e446d..37fed113382 100644 --- a/src/libsyntax/abi.rs +++ b/src/libsyntax/abi.rs @@ -40,11 +40,8 @@ pub enum Architecture { Mips } -// FIXME(#5423) After a snapshot, we can change these constants: -// const IntelBits: u32 = (1 << (X86 as uint)) | (1 << X86_64 as uint)); -// const ArmBits: u32 = (1 << (Arm as uint)); -static IntelBits: u32 = 1 | 2; -static ArmBits: u32 = 4; +static IntelBits: u32 = (1 << (X86 as uint)) | (1 << (X86_64 as uint)); +static ArmBits: u32 = (1 << (Arm as uint)); struct AbiData { abi: Abi, |