From d52d412c2c6d7e89f96bca154c6454cb60c6adba Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Thu, 8 Mar 2012 20:55:58 +0000
Subject: [PATCH] Restore i386 as the default for architecture=x86
 address-model=32.

[SVN r77276]
---
 v2/tools/gcc.jam | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index 7c895d696..ee3aae128 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -1101,8 +1101,8 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : val
 #
 # 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 ;