mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 00:52:16 +00:00
Merged from trunk: By default, when 32 bit x86 build is requested, i686 instruction set is chosen now. i386 instruction set removed since de facto it is not supported by some core libraries (Boost.Atomic and Boost.SmartPtr) and major operating systems. The minimum 32 bit x86 instruction set is i486 now. Also added a few more instruction sets that appeared in recent CPUs.
[SVN r84254]
This commit is contained in:
Andrey Semashev
@@ -78,7 +78,7 @@ local rule default-host-os ( )
|
||||
case MACOSX : host-os = darwin ;
|
||||
case KFREEBSD : host-os = freebsd ;
|
||||
case LINUX : host-os = linux ;
|
||||
case SUNOS :
|
||||
case SUNOS :
|
||||
ECHO "SunOS is not a supported operating system." ;
|
||||
ECHO "We believe last version of SunOS was released in 1992, " ;
|
||||
ECHO "so if you get this message, something is very wrong with configuration logic. " ;
|
||||
@@ -271,11 +271,12 @@ feature.feature architecture :
|
||||
# The specific instruction set in an architecture to compile.
|
||||
feature.feature instruction-set :
|
||||
# x86 and x86-64
|
||||
native i386 i486 i586 i686 pentium pentium-mmx pentiumpro pentium2 pentium3
|
||||
pentium3m pentium-m pentium4 pentium4m prescott nocona core2 conroe conroe-xe
|
||||
conroe-l allendale mermon mermon-xe kentsfield kentsfield-xe penryn wolfdale
|
||||
yorksfield nehalem k6 k6-2 k6-3 athlon athlon-tbird athlon-4 athlon-xp
|
||||
athlon-mp k8 opteron athlon64 athlon-fx winchip-c6 winchip2 c3 c3-2
|
||||
native i486 i586 i686 pentium pentium-mmx pentiumpro pentium2 pentium3
|
||||
pentium3m pentium-m pentium4 pentium4m prescott nocona core2 corei7 corei7-avx core-avx-i
|
||||
conroe conroe-xe conroe-l allendale merom merom-xe kentsfield kentsfield-xe penryn wolfdale
|
||||
yorksfield nehalem sandy-bridge ivy-bridge haswell k6 k6-2 k6-3 athlon athlon-tbird athlon-4 athlon-xp
|
||||
athlon-mp k8 opteron athlon64 athlon-fx k8-sse3 opteron-sse3 athlon64-sse3 amdfam10 barcelona
|
||||
bdver1 bdver2 bdver3 btver1 btver2 winchip-c6 winchip2 c3 c3-2 atom
|
||||
|
||||
# ia64
|
||||
itanium itanium1 merced itanium2 mckinley
|
||||
@@ -542,7 +543,7 @@ class searched-lib-generator : generator
|
||||
|
||||
rule __init__ ( )
|
||||
{
|
||||
# The requirements cause the generators to be tried *only* when we're
|
||||
# The requirements cause the generators to be tried *only* when we are
|
||||
# building a lib target with a 'search' feature. This seems ugly --- all
|
||||
# we want is to make sure searched-lib-generator is not invoked deep
|
||||
# inside transformation search to produce intermediate targets.
|
||||
@@ -639,7 +640,7 @@ rule preprocessed ( name : sources * : requirements * : default-build * :
|
||||
return [ targets.main-target-alternative
|
||||
[ new preprocessed-target-class $(name) : $(project)
|
||||
: [ targets.main-target-sources $(sources) : $(name) ]
|
||||
: [ targets.main-target-requirements $(r) : $(project) ]
|
||||
: [ targets.main-target-requirements $(requirements) : $(project) ]
|
||||
: [ targets.main-target-default-build $(default-build) : $(project) ]
|
||||
: [ targets.main-target-usage-requirements $(usage-requirements) : $(project) ]
|
||||
] ] ;
|
||||
@@ -662,8 +663,15 @@ class compile-action : action
|
||||
rule adjust-properties ( property-set )
|
||||
{
|
||||
local s = [ $(self.targets[1]).creating-subvariant ] ;
|
||||
return [ $(property-set).add-raw
|
||||
[ $(s).implicit-includes "include" : H ] ] ;
|
||||
if $(s)
|
||||
{
|
||||
return [ $(property-set).add-raw
|
||||
[ $(s).implicit-includes "include" : H ] ] ;
|
||||
}
|
||||
else
|
||||
{
|
||||
return $(property-set) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -267,11 +267,12 @@ def register_globals ():
|
||||
# The specific instruction set in an architecture to compile.
|
||||
feature.feature('instruction-set', [
|
||||
# x86 and x86-64
|
||||
'i386', 'i486', 'i586', 'i686', 'pentium', 'pentium-mmx', 'pentiumpro', 'pentium2', 'pentium3',
|
||||
'pentium3m', 'pentium-m', 'pentium4', 'pentium4m', 'prescott', 'nocona', 'conroe', 'conroe-xe',
|
||||
'conroe-l', 'allendale', 'mermon', 'mermon-xe', 'kentsfield', 'kentsfield-xe', 'penryn', 'wolfdale',
|
||||
'yorksfield', 'nehalem', 'k6', 'k6-2', 'k6-3', 'athlon', 'athlon-tbird', 'athlon-4', 'athlon-xp',
|
||||
'athlon-mp', 'k8', 'opteron', 'athlon64', 'athlon-fx', 'winchip-c6', 'winchip2', 'c3', 'c3-2',
|
||||
'native', 'i486', 'i586', 'i686', 'pentium', 'pentium-mmx', 'pentiumpro', 'pentium2', 'pentium3',
|
||||
'pentium3m', 'pentium-m', 'pentium4', 'pentium4m', 'prescott', 'nocona', 'core2', 'corei7', 'corei7-avx', 'core-avx-i',
|
||||
'conroe', 'conroe-xe', 'conroe-l', 'allendale', 'merom', 'merom-xe', 'kentsfield', 'kentsfield-xe', 'penryn', 'wolfdale',
|
||||
'yorksfield', 'nehalem', 'sandy-bridge', 'ivy-bridge', 'haswell', 'k6', 'k6-2', 'k6-3', 'athlon', 'athlon-tbird', 'athlon-4', 'athlon-xp',
|
||||
'athlon-mp', 'k8', 'opteron', 'athlon64', 'athlon-fx', 'k8-sse3', 'opteron-sse3', 'athlon64-sse3', 'amdfam10', 'barcelona',
|
||||
'bdver1', 'bdver2', 'bdver3', 'btver1', 'btver2', 'winchip-c6', 'winchip2', 'c3', 'c3-2', 'atom',
|
||||
|
||||
# ia64
|
||||
'itanium', 'itanium1', 'merced', 'itanium2', 'mckinley',
|
||||
|
||||
584
v2/tools/gcc.jam
584
v2/tools/gcc.jam
File diff suppressed because it is too large
Load Diff
@@ -709,10 +709,10 @@ def cpu_flags(toolset, variable, architecture, instruction_set, values, default=
|
||||
# x86 and compatible
|
||||
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32'])
|
||||
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'i386', ['-march=i386'], default=True)
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
|
||||
@@ -724,6 +724,25 @@ cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
|
||||
@@ -737,10 +756,22 @@ cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
|
||||
##
|
||||
cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
|
||||
# Sparc
|
||||
flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
|
||||
flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
|
||||
|
||||
@@ -132,9 +132,16 @@ flags intel-darwin.compile OPTIONS <cxxflags> ;
|
||||
flags intel-darwin.compile OPTIONS <optimization>space : -O1 ; # no specific space optimization flag in icc
|
||||
|
||||
#
|
||||
cpu-type-em64t = prescott nocona ;
|
||||
flags intel-darwin.compile OPTIONS <instruction-set>$(cpu-type-em64t)/<address-model>32 : -m32 ; # -mcmodel=small ;
|
||||
flags intel-darwin.compile OPTIONS <instruction-set>$(cpu-type-em64t)/<address-model>64 : -m64 ; # -mcmodel=large ;
|
||||
.cpu-type-em64t = prescott nocona core2 corei7 corei7-avx core-avx-i
|
||||
conroe conroe-xe conroe-l allendale merom
|
||||
merom-xe kentsfield kentsfield-xe penryn wolfdale
|
||||
yorksfield nehalem sandy-bridge ivy-bridge haswell ;
|
||||
.cpu-type-amd64 = k8 opteron athlon64 athlon-fx k8-sse3 opteron-sse3
|
||||
athlon64-sse3 amdfam10 barcelona bdver1 bdver2 bdver3 btver1 btver2 ;
|
||||
.cpu-type-x86-64 = $(.cpu-type-em64t) $(.cpu-type-amd64) ;
|
||||
|
||||
flags intel-darwin.compile OPTIONS <instruction-set>$(.cpu-type-x86-64)/<address-model>32 : -m32 ; # -mcmodel=small ;
|
||||
flags intel-darwin.compile OPTIONS <instruction-set>$(.cpu-type-x86-64)/<address-model>64 : -m64 ; # -mcmodel=large ;
|
||||
|
||||
flags intel-darwin.compile.c OPTIONS <warnings>off : -w0 ;
|
||||
flags intel-darwin.compile.c OPTIONS <warnings>on : -w1 ;
|
||||
|
||||
@@ -232,7 +232,6 @@ rule configure-version-specific ( toolset : version : conditions )
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/<optimization>space : /Os ;
|
||||
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/<instruction-set> : /GB ;
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/<instruction-set>i386 : /G3 ;
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/<instruction-set>i486 : /G4 ;
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/<instruction-set>$(.cpu-type-g5) : /G5 ;
|
||||
toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/<instruction-set>$(.cpu-type-g6) : /G6 ;
|
||||
@@ -466,18 +465,18 @@ actions compile.rc
|
||||
rule link ( targets + : sources * : properties * )
|
||||
{
|
||||
if <embed-manifest>on in $(properties)
|
||||
{
|
||||
{
|
||||
msvc.manifest $(targets) : $(sources) : $(properties) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rule link.dll ( targets + : sources * : properties * )
|
||||
{
|
||||
DEPENDS $(<) : [ on $(<) return $(DEF_FILE) ] ;
|
||||
if <embed-manifest>on in $(properties)
|
||||
{
|
||||
{
|
||||
msvc.manifest.dll $(targets) : $(sources) : $(properties) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Incremental linking a DLL causes no end of problems: if the actual exports do
|
||||
@@ -497,14 +496,14 @@ if [ os.name ] in NT
|
||||
$(.LD) $(LINKFLAGS) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(.nl)"$(>)" $(.nl)$(LIBRARIES_MENTIONED_BY_FILE) $(.nl)$(LIBRARIES) $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
|
||||
}
|
||||
|
||||
|
||||
actions manifest
|
||||
{
|
||||
{
|
||||
if exist "$(<[1]).manifest" (
|
||||
$(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);1"
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
actions link.dll bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) /DLL $(LINKFLAGS) /out:"$(<[1]:W)" /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:"$(DEF_FILE)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(.nl)"$(>)" $(.nl)$(LIBRARIES_MENTIONED_BY_FILE) $(.nl)$(LIBRARIES) $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
@@ -512,37 +511,37 @@ if [ os.name ] in NT
|
||||
}
|
||||
|
||||
actions manifest.dll
|
||||
{
|
||||
{
|
||||
if exist "$(<[1]).manifest" (
|
||||
$(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);2"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
actions link bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) $(LINKFLAGS) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(.nl)"$(>)" $(.nl)$(LIBRARIES_MENTIONED_BY_FILE) $(.nl)$(LIBRARIES) $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
}
|
||||
|
||||
actions manifest
|
||||
{
|
||||
{
|
||||
if test -e "$(<[1]).manifest"; then
|
||||
$(.MT) -manifest "$(<[1]:W).manifest" "-outputresource:$(<[1]:W);1"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
actions link.dll bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) /DLL $(LINKFLAGS) /out:"$(<[1]:W)" /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:"$(DEF_FILE)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(.nl)"$(>)" $(.nl)$(LIBRARIES_MENTIONED_BY_FILE) $(.nl)$(LIBRARIES) $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(.nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
}
|
||||
|
||||
|
||||
actions manifest.dll
|
||||
{
|
||||
if test -e "$(<[1]).manifest"; then
|
||||
$(.MT) -manifest "$(<[1]:W).manifest" "-outputresource:$(<[1]:W);2"
|
||||
fi
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# this rule sets up the pdb file that will be used when generating static
|
||||
@@ -797,9 +796,9 @@ local rule configure-really ( version ? : options * )
|
||||
# toolset version.
|
||||
command = [ common.get-absolute-tool-path $(command[-1]) ] ;
|
||||
}
|
||||
|
||||
|
||||
if $(command)
|
||||
{
|
||||
{
|
||||
local parent = [ path.make $(command) ] ;
|
||||
parent = [ path.parent $(parent) ] ;
|
||||
parent = [ path.native $(parent) ] ;
|
||||
@@ -1344,10 +1343,12 @@ if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
|
||||
.cpu-type-g5 = i586 pentium pentium-mmx ;
|
||||
.cpu-type-g6 = i686 pentiumpro pentium2 pentium3 pentium3m pentium-m k6
|
||||
k6-2 k6-3 winchip-c6 winchip2 c3 c3-2 ;
|
||||
.cpu-type-em64t = prescott nocona conroe conroe-xe conroe-l allendale mermon
|
||||
mermon-xe kentsfield kentsfield-xe penryn wolfdale
|
||||
yorksfield nehalem ;
|
||||
.cpu-type-amd64 = k8 opteron athlon64 athlon-fx ;
|
||||
.cpu-type-em64t = prescott nocona core2 corei7 corei7-avx core-avx-i
|
||||
conroe conroe-xe conroe-l allendale merom
|
||||
merom-xe kentsfield kentsfield-xe penryn wolfdale
|
||||
yorksfield nehalem sandy-bridge ivy-bridge haswell ;
|
||||
.cpu-type-amd64 = k8 opteron athlon64 athlon-fx k8-sse3 opteron-sse3
|
||||
athlon64-sse3 amdfam10 barcelona bdver1 bdver2 bdver3 btver1 btver2 ;
|
||||
.cpu-type-g7 = pentium4 pentium4m athlon athlon-tbird athlon-4 athlon-xp
|
||||
athlon-mp $(.cpu-type-em64t) $(.cpu-type-amd64) ;
|
||||
.cpu-type-itanium = itanium itanium1 merced ;
|
||||
|
||||
@@ -176,7 +176,6 @@ def configure_version_specific(toolset_arg, version, conditions):
|
||||
|
||||
cpu_arch_i386_cond = extend_conditions(conditions, __cpu_arch_i386)
|
||||
toolset.flags('{}.compile'.format(toolset_arg), 'CFLAGS', extend_conditions(cpu_arch_i386_cond,['<instruction-set>']),['/GB'])
|
||||
toolset.flags('{}.compile'.format(toolset_arg), 'CFLAGS', extend_conditions(cpu_arch_i386_cond,['<instruction-set>i386']),['/G3'])
|
||||
toolset.flags('{}.compile'.format(toolset_arg), 'CFLAGS', extend_conditions(cpu_arch_i386_cond,['<instruction-set>i486']),['/G4'])
|
||||
|
||||
toolset.flags('{}.compile'.format(toolset_arg), 'CFLAGS', extend_conditions(cpu_arch_i386_cond,['<instruction-set>' + t for t in __cpu_type_g5]), ['/G5'])
|
||||
@@ -1145,10 +1144,11 @@ __cpu_arch_ia64 = [
|
||||
__cpu_type_g5 = ['i586', 'pentium', 'pentium-mmx' ]
|
||||
__cpu_type_g6 = ['i686', 'pentiumpro', 'pentium2', 'pentium3', 'pentium3m', 'pentium-m', 'k6',
|
||||
'k6-2', 'k6-3', 'winchip-c6', 'winchip2', 'c3', 'c3-2' ]
|
||||
__cpu_type_em64t = ['prescott', 'nocona', 'conroe', 'conroe-xe', 'conroe-l', 'allendale', 'mermon',
|
||||
'mermon-xe', 'kentsfield', 'kentsfield-xe', 'penryn', 'wolfdale',
|
||||
'yorksfield', 'nehalem' ]
|
||||
__cpu_type_amd64 = ['k8', 'opteron', 'athlon64', 'athlon-fx']
|
||||
__cpu_type_em64t = ['prescott', 'nocona', 'core2', 'corei7', 'corei7-avx', 'core-avx-i', 'conroe', 'conroe-xe', 'conroe-l', 'allendale', 'merom',
|
||||
'merom-xe', 'kentsfield', 'kentsfield-xe', 'penryn', 'wolfdale',
|
||||
'yorksfield', 'nehalem', 'sandy-bridge', 'ivy-bridge', 'haswell' ]
|
||||
__cpu_type_amd64 = ['k8', 'opteron', 'athlon64', 'athlon-fx', 'k8-sse3', 'opteron-sse3', 'athlon64-sse3', 'amdfam10', 'barcelona',
|
||||
'bdver1', 'bdver2', 'bdver3', 'btver1', 'btver2' ]
|
||||
__cpu_type_g7 = ['pentium4', 'pentium4m', 'athlon', 'athlon-tbird', 'athlon-4', 'athlon-xp'
|
||||
'athlon-mp'] + __cpu_type_em64t + __cpu_type_amd64
|
||||
__cpu_type_itanium = ['itanium', 'itanium1', 'merced']
|
||||
|
||||
Reference in New Issue
Block a user