[Boost-commit] svn:boost r77276 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r77276 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2012-03-08 15:55:59

Author: steven_watanabe
Date: 2012-03-08 15:55:58 EST (Thu, 08 Mar 2012)
New Revision: 77276
URL: http://svn.boost.org/trac/boost/changeset/77276

Log:
Restore i386 as the default for architecture=x86 address-model=32.
Text files modified: 
   trunk/tools/build/v2/tools/gcc.jam |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/gcc.jam
==============================================================================
--- trunk/tools/build/v2/tools/gcc.jam	(original)
+++ trunk/tools/build/v2/tools/gcc.jam	2012-03-08 15:55:58 EST (Thu, 08 Mar 2012)
@@ -1101,8 +1101,8 @@
 #
 # x86 and compatible
 # The 'native' option appeared in gcc 4.2 so we cannot safely use it
-# as default. Don't use i386 instead otherwise you get combinations like
-# -march=i386 -m64.
+# as default. Use conservative i386 instead for 32-bit.
+toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i386 ;
 cpu-flags gcc OPTIONS : x86 : native : -march=native ;
 cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 ;
 cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;