Attachment #542740 for bug #646070




    return [ property.select <target-os> <toolset> $(toolset-version-property) : $(properties) ] ;
}

feature.feature deduced-address-model : 32 32_64 64 : propagated optional composite hidden ;
feature.compose <deduced-address-model>32 : <address-model>32 ;
feature.compose <deduced-address-model>32_64 : <address-model>32_64 ;
feature.compose <deduced-address-model>64 : <address-model>64 ;

rule deduce-address-model ( properties * )
{
    local result ;
    local filtered = [ toolset-properties $(properties) ] ;
    local names = 32 32_64 64 ;
    local idx = [ configure.find-builds "default address-model" : $(filtered)
        : /boost/architecture//32 "32-bit"
        : /boost/architecture//32_64 "64-bit x32"
        : /boost/architecture//64 "64-bit" ] ;
    result = $(names[$(idx)]) ;


Line 0 Link Here

(-)a/libs/config/checks/architecture/32_64.cpp (+3 lines)
	1	#if !defined(__x86_64__) \|\| !defined(__ILP32__)
	2	#error "Not x86_64 x32 abi"
	3	#endif

Lines 6-9 Link Here

(-)a/libs/config/checks/architecture/32.cpp (+3 lines)
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];

Lines 6-9 Link Here

(-)a/libs/config/checks/architecture/64.cpp (+3 lines)
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];

Lines 13-18 Link Here

(-)a/libs/config/checks/architecture/Jamroot.jam (+1 lines)
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 ;

Return to bug 646070

Lines 676-692 Link Here

(-)a/boostcpp.jam (-2 / +4 lines)
676	return [ property.select <target-os> <toolset> $(toolset-version-property) : $(properties) ] ;	676	return [ property.select <target-os> <toolset> $(toolset-version-property) : $(properties) ] ;
677	}	677	}
678		678
679	feature.feature deduced-address-model : 32 64 : propagated optional composite hidden ;	679	feature.feature deduced-address-model : 32 32_64 64 : propagated optional composite hidden ;
680	feature.compose <deduced-address-model>32 : <address-model>32 ;	680	feature.compose <deduced-address-model>32 : <address-model>32 ;
		681	feature.compose <deduced-address-model>32_64 : <address-model>32_64 ;
681	feature.compose <deduced-address-model>64 : <address-model>64 ;	682	feature.compose <deduced-address-model>64 : <address-model>64 ;
682		683
683	rule deduce-address-model ( properties * )	684	rule deduce-address-model ( properties * )
684	{	685	{
685	local result ;	686	local result ;
686	local filtered = [ toolset-properties $(properties) ] ;	687	local filtered = [ toolset-properties $(properties) ] ;
687	local names = 32 64 ;	688	local names = 32 32_64 64 ;
688	local idx = [ configure.find-builds "default address-model" : $(filtered)	689	local idx = [ configure.find-builds "default address-model" : $(filtered)
689	: /boost/architecture//32 "32-bit"	690	: /boost/architecture//32 "32-bit"
		691	: /boost/architecture//32_64 "64-bit x32"
690	: /boost/architecture//64 "64-bit" ] ;	692	: /boost/architecture//64 "64-bit" ] ;
691	result = $(names[$(idx)]) ;	693	result = $(names[$(idx)]) ;
692		694