Mercurial > projects > ldc

changeset 1027:c061e0725d89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops, merge with mainline and actually push this time...
author Frits van Bommel <fvbommel wxs.nl>
date Tue, 03 Mar 2009 09:51:15 +0100
parents f756c47f310a (diff) c519caae3181 (current diff)
children 964af20461a9
files
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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