Skip to content

Commit 86c965e

Browse files
committed
---
yaml --- r: 46312 b: refs/heads/auto c: 0e83102 h: refs/heads/master v: v3
1 parent bf47a24 commit 86c965e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 5c75f210ba6e450fb1603b50ca0a4805f13173d7
17+
refs/heads/auto: 0e8310221925680b5e13c080511ce1d733b7dc18

branches/auto/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ syn match rustAssert "\<assert\(\w\)*"
1414
syn keyword rustKeyword as break
1515
syn keyword rustKeyword copy do drop else extern
1616
syn keyword rustKeyword for if impl let log
17-
syn keyword rustKeyword loop match mod once priv pub pure
17+
syn keyword rustKeyword loop match mod move once priv pub pure
1818
syn keyword rustKeyword ref return static
1919
syn keyword rustKeyword unsafe use while
2020
" FIXME: Scoped impl's name is also fallen in this category

branches/auto/src/librustc/driver/driver.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,20 @@ pub fn default_configuration(sess: Session, +argv0: ~str, input: input) ->
8888

8989
let mk = attr::mk_name_value_item_str;
9090

91-
let (arch,wordsz) = match sess.targ_cfg.arch {
92-
session::arch_x86 => (~"x86",~"32"),
93-
session::arch_x86_64 => (~"x86_64",~"64"),
94-
session::arch_arm => (~"arm",~"32")
91+
// ARM is bi-endian, however using NDK seems to default
92+
// to little-endian unless a flag is provided.
93+
let (end,arch,wordsz) = match sess.targ_cfg.arch {
94+
session::arch_x86 => (~"little",~"x86",~"32"),
95+
session::arch_x86_64 => (~"little",~"x86_64",~"64"),
96+
session::arch_arm => (~"little",~"arm",~"32")
9597
};
9698

9799
return ~[ // Target bindings.
98100
attr::mk_word_item(str::from_slice(os::FAMILY)),
99101
mk(~"target_os", tos),
100102
mk(~"target_family", str::from_slice(os::FAMILY)),
101103
mk(~"target_arch", arch),
104+
mk(~"target_endian", end),
102105
mk(~"target_word_size", wordsz),
103106
mk(~"target_libc", libc),
104107
// Build bindings.

0 commit comments

Comments
 (0)