--- a/ParserFlags.st	Sat Mar 23 12:36:20 2013 +0100
+++ b/ParserFlags.st	Sat Mar 23 12:37:41 2013 +0100
@@ -1518,7 +1518,7 @@
      notice: for now, can only initialize for borland+windows or linux;
      visualC setup still fails."
 
-    |topDir topDirName vcTop sdkTop bccTop useBorlandC useVisualC useMingw|
+    |topDir topDirName vcTop sdkTop bccTop useBorlandC useVisualC useMingw m32|
 
     topDir := topDirArg.
     OperatingSystem isMSWINDOWSlike ifTrue:[
@@ -1613,14 +1613,22 @@
         STCCompilationDefines := ''.
         STCCompilationOptions := '+optinline +inlineNew'.
         STCPath := topDirName,'/stc/stc'.
-        CCCompilationOptions := '-O -m32'.
+
+        m32 := ''.
+        (Smalltalk configuration includesString:'amd64_mode32') ifTrue:[
+            m32 := ' -m32'
+        ].
+        CCCompilationOptions := OperatingSystem getCPUDefine,
+                                ' ',OperatingSystem getCCDefine,
+                                ' ',OperatingSystem getOSDefine,
+                                ' ','-O',m32.
         ParserFlags useGnuC ifTrue:[
             CCPath := 'gcc'
         ] ifFalse:[
             CCPath := 'cc'
         ].
-        LinkArgs := '-m32'.
-        LinkSharedArgs := '-shared -m32'.
+        LinkArgs := m32.
+        LinkSharedArgs := '-shared',m32.
         LinkCommand := CCPath.
         LibPath := ''.
         SearchedLibraries := #().
@@ -2522,11 +2530,11 @@
 !ParserFlags class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.98 2013-02-21 14:03:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.99 2013-03-23 11:37:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.98 2013-02-21 14:03:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ParserFlags.st,v 1.99 2013-03-23 11:37:41 cg Exp $'
 ! !