rollup merge of #18684 : nathan7/patch-1

This commit is contained in:
Alex Crichton 2014-11-06 13:32:15 -08:00
commit ec983c684b

View File

@ -1,9 +1,10 @@
{ {
"data-layout": "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32", "pre-link-args": ["-m64"],
"llvm-target": "i686-unknown-linux-gnu", "data-layout": "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128",
"llvm-target": "x86_64-unknown-linux-gnu",
"target-endian": "little", "target-endian": "little",
"target-word-size": "32", "target-word-size": "64",
"arch": "x86", "arch": "x86_64",
"os": "linux", "os": "linux",
"morestack": false "morestack": false
} }