]>
Commit | Line | Data |
---|---|---|
bfed7e70 JR |
1 | --- boost_1_58_0/tools/build/src/tools/gcc.jam~ 2015-06-07 11:33:34.000000000 +0200 |
2 | +++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-06-07 11:38:59.720016555 +0200 | |
3 | @@ -366,9 +366,9 @@ | |
4 | toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ; | |
5 | ||
6 | # Declare flags and action for compilation. | |
7 | -toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; | |
8 | -toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; | |
9 | -toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; | |
10 | +toolset.flags gcc.compile OPTIONS <optimization>off : ; | |
11 | +toolset.flags gcc.compile OPTIONS <optimization>speed : ; | |
12 | +toolset.flags gcc.compile OPTIONS <optimization>space : ; | |
13 | ||
14 | toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; | |
15 | toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ; | |
16 | @@ -379,8 +379,8 @@ | |
17 | toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ; | |
18 | toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ; | |
19 | ||
20 | -toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ; | |
21 | -toolset.flags gcc.compile OPTIONS <profiling>on : -pg ; | |
22 | +toolset.flags gcc.compile OPTIONS <debug-symbols>on : ; | |
23 | +toolset.flags gcc.compile OPTIONS <profiling>on : ; | |
24 | ||
25 | toolset.flags gcc.compile.c++ OPTIONS <rtti>off : -fno-rtti ; | |
26 | toolset.flags gcc.compile.c++ OPTIONS <exception-handling>off : -fno-exceptions ; | |
27 | @@ -448,23 +448,6 @@ | |
28 | option = -mlp64 ; | |
29 | } | |
30 | } | |
31 | - else | |
32 | - { | |
33 | - local arch = [ feature.get-values architecture : $(properties) ] ; | |
34 | - if $(arch) != arm | |
35 | - { | |
36 | - if $(model) = 32 | |
37 | - { | |
38 | - option = -m32 ; | |
39 | - } | |
40 | - else if $(model) = 64 | |
41 | - { | |
42 | - option = -m64 ; | |
43 | - } | |
44 | - } | |
45 | - # For darwin, the model can be 32_64. darwin.jam will handle that | |
46 | - # on its own. | |
47 | - } | |
48 | OPTIONS on $(targets) += $(option) ; | |
49 | } | |
50 | } | |
51 | @@ -1073,7 +1056,7 @@ | |
52 | # x86 and compatible | |
53 | # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. | |
54 | # Use i686 instead for 32-bit. | |
55 | -toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; | |
56 | +toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : ; | |
57 | cpu-flags gcc OPTIONS : x86 : native : -march=native ; | |
58 | cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; | |
59 | cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; |