From efeb8fcecaa1bb5bb682b3be9f39218781f09805 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Sun, 4 Mar 2012 10:11:00 +0000 Subject: [PATCH] tools: remove default 'i386' for architecture on x86 [SVN r77201] --- src/tools/gcc.jam | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam index f7b0da542..f2cc572d3 100644 --- a/src/tools/gcc.jam +++ b/src/tools/gcc.jam @@ -1097,9 +1097,10 @@ 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. Use conservative i386 instead. +# as default. Don't use i386 instead otherwise you get combinations like +# -march=i386 -m64. cpu-flags gcc OPTIONS : x86 : native : -march=native ; -cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 : default ; +cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 ; cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;