---

yaml
---
r: 31595
b: refs/heads/dist-snap
c: ff00edb
h: refs/heads/master
i:
  31593: 5832ee2
  31591: de8671b
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: b14a6aca9f5f62df2ac12ee92d0ca37514908305
+refs/heads/dist-snap: ff00edb7e1fd669b7a333e0b3842f3751ee6d573
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/driver/driver.rs

@@ -44,17 +44,18 @@ fn default_configuration(sess: session, argv0: ~str, input: input) ->
 
     let mk = attr::mk_name_value_item_str;
 
-    let arch = alt sess.targ_cfg.arch {
-      session::arch_x86 { ~"x86" }
-      session::arch_x86_64 { ~"x86_64" }
-      session::arch_arm { ~"arm" }
+    let (arch,wordsz) = alt sess.targ_cfg.arch {
+      session::arch_x86 { (~"x86",~"32") }
+      session::arch_x86_64 { (~"x86_64",~"64") }
+      session::arch_arm { (~"arm",~"32") }
     };
 
     return ~[ // Target bindings.
          attr::mk_word_item(@os::family()),
          mk(@~"target_os", os::sysname()),
          mk(@~"target_family", os::family()),
          mk(@~"target_arch", arch),
+         mk(@~"target_word_size", wordsz),
          mk(@~"target_libc", libc),
          // Build bindings.
          mk(@~"build_compiler", argv0),