]>
Commit | Line | Data |
---|---|---|
dade1db4 JB |
1 | --- boost_1_67_0/tools/build/src/tools/gcc.jam.orig 2018-04-11 15:49:09.000000000 +0200 |
2 | +++ boost_1_67_0/tools/build/src/tools/gcc.jam 2018-07-16 19:40:36.332045183 +0200 | |
3 | @@ -356,11 +356,6 @@ | |
4 | ||
5 | compile-link-flags <target-os>hpux/<address-model>32 : -milp32 ; | |
6 | compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ; | |
7 | - | |
8 | - local generic-os = [ set.difference $(all-os) : aix hpux ] ; | |
9 | - local arch = power sparc x86 ; | |
10 | - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ; | |
11 | - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; | |
12 | } | |
13 | ||
14 | { | |
15 | @@ -624,9 +619,9 @@ | |
16 | ### | |
bfed7e70 JR |
17 | |
18 | # Declare flags and action for compilation. | |
19 | -toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; | |
20 | -toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; | |
21 | -toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; | |
22 | +toolset.flags gcc.compile OPTIONS <optimization>off : ; | |
23 | +toolset.flags gcc.compile OPTIONS <optimization>speed : ; | |
24 | +toolset.flags gcc.compile OPTIONS <optimization>space : ; | |
25 | ||
26 | toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; | |
27 | toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ; | |
dade1db4 | 28 | @@ -637,8 +632,8 @@ |
bfed7e70 JR |
29 | toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ; |
30 | toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ; | |
31 | ||
32 | -toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ; | |
33 | -toolset.flags gcc.compile OPTIONS <profiling>on : -pg ; | |
34 | +toolset.flags gcc.compile OPTIONS <debug-symbols>on : ; | |
35 | +toolset.flags gcc.compile OPTIONS <profiling>on : ; | |
36 | ||
37 | toolset.flags gcc.compile.c++ OPTIONS <rtti>off : -fno-rtti ; | |
38 | toolset.flags gcc.compile.c++ OPTIONS <exception-handling>off : -fno-exceptions ; | |
dade1db4 | 39 | @@ -1069,7 +1064,7 @@ |
bfed7e70 JR |
40 | # x86 and compatible |
41 | # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. | |
42 | # Use i686 instead for 32-bit. | |
43 | -toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; | |
44 | +toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : ; | |
45 | cpu-flags gcc OPTIONS : x86 : native : -march=native ; | |
46 | cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; | |
47 | cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; |