|
Line
Link Here
|
| 0 |
-- a/boostcpp.jam |
0 |
++ b/boostcpp.jam |
|
Lines 621-628
Link Here
|
| 621 |
return [ property.select <target-os> <toolset> $(toolset-version-property) : $(properties) ] ; |
621 |
return [ property.select <target-os> <toolset> $(toolset-version-property) : $(properties) ] ; |
| 622 |
} |
622 |
} |
| 623 |
|
623 |
|
| 624 |
feature.feature deduced-address-model : 32 64 : propagated optional composite hidden ; |
624 |
feature.feature deduced-address-model : 32 32_64 64 : propagated optional composite hidden ; |
| 625 |
feature.compose <deduced-address-model>32 : <address-model>32 ; |
625 |
feature.compose <deduced-address-model>32 : <address-model>32 ; |
|
|
626 |
feature.compose <deduced-address-model>32_64 : <address-model>32_64 ; |
| 626 |
feature.compose <deduced-address-model>64 : <address-model>64 ; |
627 |
feature.compose <deduced-address-model>64 : <address-model>64 ; |
| 627 |
|
628 |
|
| 628 |
rule deduce-address-model ( properties * ) |
629 |
rule deduce-address-model ( properties * ) |
|
Lines 634-639
Link Here
|
| 634 |
{ |
635 |
{ |
| 635 |
result = 32 ; |
636 |
result = 32 ; |
| 636 |
} |
637 |
} |
|
|
638 |
else if [ configure.builds /boost/architecture//32_64 : $(filtered) : "64-bit x32" ] |
| 639 |
{ |
| 640 |
result = 32_64 ; |
| 641 |
} |
| 637 |
else if [ configure.builds /boost/architecture//64 : $(filtered) : 64-bit ] |
642 |
else if [ configure.builds /boost/architecture//64 : $(filtered) : 64-bit ] |
| 638 |
{ |
643 |
{ |
| 639 |
result = 64 ; |
644 |
result = 64 ; |
| 640 |
-- a/libs/config/checks/architecture/32_64.cpp |
645 |
++ b/libs/config/checks/architecture/32_64.cpp |
|
Line 0
Link Here
|
| 0 |
-- a/libs/config/checks/architecture/32.cpp |
1 |
#if !defined(__x86_64__) || !defined(__ILP32__) |
|
|
2 |
#error "Not x86_64 x32 abi" |
| 3 |
#endif |
|
|
4 |
++ b/libs/config/checks/architecture/32.cpp |
|
Lines 6-9
Link Here
|
| 6 |
// accompanying file LICENSE_1_0.txt or copy at |
6 |
// accompanying file LICENSE_1_0.txt or copy at |
| 7 |
// http://www.boost.org/LICENSE_1_0.txt) |
7 |
// http://www.boost.org/LICENSE_1_0.txt) |
| 8 |
|
8 |
|
|
|
9 |
#ifdef __x86_64__ |
| 10 |
#error |
| 11 |
#endif |
| 9 |
int test[sizeof(void*) == 4? 1 : -1]; |
12 |
int test[sizeof(void*) == 4? 1 : -1]; |
| 10 |
-- a/libs/config/checks/architecture/64.cpp |
13 |
++ b/libs/config/checks/architecture/64.cpp |
|
Lines 6-9
Link Here
|
| 6 |
// accompanying file LICENSE_1_0.txt or copy at |
6 |
// accompanying file LICENSE_1_0.txt or copy at |
| 7 |
// http://www.boost.org/LICENSE_1_0.txt) |
7 |
// http://www.boost.org/LICENSE_1_0.txt) |
| 8 |
|
8 |
|
|
|
9 |
#ifdef __ILP32__ |
| 10 |
#error |
| 11 |
#endif |
| 9 |
int test[sizeof(void*) == 8? 1 : -1]; |
12 |
int test[sizeof(void*) == 8? 1 : -1]; |
| 10 |
-- a/libs/config/checks/architecture/Jamroot.jam |
13 |
++ b/libs/config/checks/architecture/Jamroot.jam |
|
Lines 13-18
Link Here
|
| 13 |
; |
13 |
; |
| 14 |
|
14 |
|
| 15 |
obj 32 : 32.cpp ; |
15 |
obj 32 : 32.cpp ; |
|
|
16 |
obj 32_64 : 32_64.cpp ; |
| 16 |
obj 64 : 64.cpp ; |
17 |
obj 64 : 64.cpp ; |
| 17 |
|
18 |
|
| 18 |
obj arm : arm.cpp ; |
19 |
obj arm : arm.cpp ; |
