Skip to content

Commit b88ef83

Browse files
committed
---
yaml --- r: 47721 b: refs/heads/incoming c: 0e83102 h: refs/heads/master i: 47719: 8536b11 v: v3
1 parent 4307186 commit b88ef83

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
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 5c75f210ba6e450fb1603b50ca0a4805f13173d7
9+
refs/heads/incoming: 0e8310221925680b5e13c080511ce1d733b7dc18
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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/incoming/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)