Enable 32bit builds.

You specify a 32bit build by setting --target on configure.

14 files changed, 10 insertions, 8 deletions

diff --git a/src/components/embedding/command_line.rs b/src/components/embedding/command_line.rs
index d862d27706e..755e2669624 100644
--- a/src/components/embedding/command_line.rs
+++ b/src/components/embedding/command_line.rs
@@ -21,7 +21,7 @@ static mut GLOBAL_CMDLINE: Option<*mut command_line_t> = None;
 fn command_line_new() -> *mut command_line_t {
     unsafe {
         let cl = calloc(1, mem::size_of::<command_line>() as size_t) as *mut command_line_t;
-        (*cl).cl.base.size = mem::size_of::<cef_command_line_t>() as u64;
+        (*cl).cl.base.size = mem::size_of::<cef_command_line_t>() as size_t;
         cl
     }
 }
@@ -59,7 +59,7 @@ pub extern "C" fn command_line_get_switch_value(cmd: *mut cef_command_line_t, na
                 let string = cef_string_userfree_utf16_alloc() as *mut cef_string_utf16_t;
                 let arg = o.slice_from(opt.len() + 1).as_bytes();
                 arg.with_c_str(|c_str| {
-                    cef_string_utf16_set(mem::transmute(c_str), arg.len() as u64, string, 1);
+                    cef_string_utf16_set(mem::transmute(c_str), arg.len() as size_t, string, 1);
                 });
                 return string as *mut cef_string_userfree_t
             }
diff --git a/src/components/embedding/embedding.rs b/src/components/embedding/embedding.rs
index a4a0293e286..cfe105da7ea 100644
--- a/src/components/embedding/embedding.rs
+++ b/src/components/embedding/embedding.rs
@@ -9,6 +9,8 @@
 
 #![feature(globs, macro_rules, phase, thread_local)]
 
+#![allow(experimental)]
+
 #![feature(phase)]
 #[phase(plugin, link)]
 extern crate log;
diff --git a/src/components/embedding/mem.rs b/src/components/embedding/mem.rs
index 7b3472aadd0..a22d2b8c4de 100644
--- a/src/components/embedding/mem.rs
+++ b/src/components/embedding/mem.rs
@@ -24,13 +24,13 @@ pub fn newarray0<T>(nmem: size_t) -> *mut T {
 
 pub fn newarray<T>(nmem: size_t) -> *mut T {
     unsafe {
-        tc_newarray(nmem * mem::size_of::<T>() as u64) as *mut T
+        tc_newarray(nmem * mem::size_of::<T>() as size_t) as *mut T
     }
 }
 
 #[allow(experimental)]
 pub fn new0<T>(nmem: size_t) -> *mut T {
-    let mem = new(nmem * mem::size_of::<T>() as u64) as *mut T;
+    let mem = new(nmem * mem::size_of::<T>() as size_t) as *mut T;
     unsafe {
         set_memory(mem, 0 as u8, nmem as uint);
     }
diff --git a/src/platform/android/fontconfig b/src/platform/android/fontconfig
-Subproject 3f9c99be6ab7f733ec38e6c566a9cfb441e8f47
+Subproject f3975a21cdea6c05a395107e849e1f28ce12e0b
diff --git a/src/platform/macos/rust-cocoa b/src/platform/macos/rust-cocoa
-Subproject 140df9dfb16cbeabbbb7059d39f9c439bd3821e
+Subproject f24aa3e1c845db32f0a9ed336453b22bfc63b7f
diff --git a/src/platform/macos/rust-core-graphics b/src/platform/macos/rust-core-graphics
-Subproject 25c0632f0748782c388d2d92203201b389a19c5
+Subproject 36817ab7a6457702ffbe0443e75820def88264b
diff --git a/src/platform/macos/rust-task_info/Makefile.in b/src/platform/macos/rust-task_info/Makefile.in
index 66e43191ffa..a844cdf6371 100644
--- a/src/platform/macos/rust-task_info/Makefile.in
+++ b/src/platform/macos/rust-task_info/Makefile.in
@@ -1,10 +1,10 @@
 VPATH=%VPATH%
 
-CC=gcc
+CC ?= gcc
 RUSTC ?= rustc
 AR ?= ar
 RUSTFLAGS ?=
-CFLAGS=-Wall
+CFLAGS += -Wall
 
 RUST_SRC = $(shell find $(VPATH)/. -type f -name '*.rs')
 
diff --git a/src/support/encoding/Makefile.in b/src/support/encoding/Makefile.in
index a30b1e51bc6..6d36cf946c2 100644
--- a/src/support/encoding/Makefile.in
+++ b/src/support/encoding/Makefile.in
@@ -6,7 +6,7 @@ CXXFLAGS ?=
 AR ?= ar
 RUSTC ?= rustc
 RUSTDOC ?= rustdoc
-RUSTFLAGS ?= -O
+RUSTFLAGS ?=
 EXT_DEPS ?=
 RUSTDOC_FLAGS ?=
 RUSTDOC_TARGET ?= doc
@@ -36,7 +36,7 @@ doctest: $(LIB_RS) $(RUST_SRC) libencoding.dummy
 	$(RUSTDOC) $< -L . --test
 
 .PHONY: check
-check: doctest rustencoding-test
+check: rustencoding-test
 	./rustencoding-test
 
 .PHONY: doc
diff --git a/src/support/hubbub/libhubbub b/src/support/hubbub/libhubbub
-Subproject c0f176ddc0157b768d689bd1e78f56006b4db48
+Subproject aa6f30d77bdcb92277648a503dd5083db0fc31a
diff --git a/src/support/libparserutils/libparserutils b/src/support/libparserutils/libparserutils
-Subproject c2feb563c8434319f60b2e9134e250d7bc1fe27
+Subproject ce1dbab3affee0b3ba569ceb93039a1961ffb42
diff --git a/src/support/phf/rust-phf b/src/support/phf/rust-phf
-Subproject 6bcf4146652a9868bc64c2835f7770c8a7007e9
+Subproject 997da1ff70cc52988641a75e1a46d4b398d5fe1
diff --git a/src/support/sharegl/sharegl b/src/support/sharegl/sharegl
-Subproject ae080410feafcc52632859b5f5916f44630712f
+Subproject f2ae0dfd8c57e851facb08522019e1a990601b3
diff --git a/src/support/spidermonkey/mozjs b/src/support/spidermonkey/mozjs
-Subproject 62f9290cf04b77024bfde8ebddb83aa386767e9
+Subproject a3454dce2b179eec3cb9906318d3e64dbc9d1a1
diff --git a/src/support/stb-image/rust-stb-image b/src/support/stb-image/rust-stb-image
-Subproject cf5cd961f5d952501c21ce64d1fcc293144a96f
+Subproject 4fd755a37a3eb443b6b35c37f042cd7d2a1aebf