# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1236070275 -3600
# Node ID c061e0725d89c28fb9084ab083de8d96cb46b971
# Parent  f756c47f310aad840e1726f00889871c773de541# Parent  c519caae31810b8b9d1e6f113ff8371f384e5493
Oops, merge with mainline and actually push this time...

diff -r c519caae3181 -r c061e0725d89 gen/linker.cpp
--- a/gen/linker.cpp	Tue Mar 03 04:41:11 2009 +0100
+++ b/gen/linker.cpp	Tue Mar 03 09:51:15 2009 +0100
@@ -320,6 +320,9 @@
     //FIXME: enforce 64 bit
     if (global.params.is64bit)
         args.push_back("-m64");
+    else
+        // Assume 32-bit?
+        args.push_back("-m32");
 
     // print link command?
     if (!quiet || global.params.verbose)
diff -r c519caae3181 -r c061e0725d89 gen/toobj.cpp
--- a/gen/toobj.cpp	Tue Mar 03 04:41:11 2009 +0100
+++ b/gen/toobj.cpp	Tue Mar 03 09:51:15 2009 +0100
@@ -333,6 +333,9 @@
     //FIXME: enforce 64 bit
     if (global.params.is64bit)
         args.push_back("-m64");
+    else
+        // Assume 32-bit?
+        args.push_back("-m32");
 
     // Now that "args" owns all the std::strings for the arguments, call the c_str
     // method to get the underlying string array.  We do this game so that the