Index: SConstruct |
=================================================================== |
--- SConstruct (revision 4694) |
+++ SConstruct (working copy) |
@@ -210,12 +210,6 @@ |
'CCFLAGS': ['-m32', '-DCAN_USE_UNALIGNED_ACCESSES=1'], |
'LINKFLAGS': ['-m32'] |
}, |
- 'armvariant:thumb2': { |
- 'CPPDEFINES': ['V8_ARM_VARIANT_THUMB'] |
- }, |
- 'armvariant:arm': { |
- 'CPPDEFINES': ['V8_ARM_VARIANT_ARM'] |
- }, |
'arch:mips': { |
'CPPDEFINES': ['V8_TARGET_ARCH_MIPS'], |
'simulator:none': { |
@@ -765,11 +759,6 @@ |
'default': 'hidden', |
'help': 'shared library symbol visibility' |
}, |
- 'armvariant': { |
- 'values': ['arm', 'thumb2', 'none'], |
- 'default': 'none', |
- 'help': 'generate thumb2 instructions instead of arm instructions (default)' |
- }, |
'pgo': { |
'values': ['off', 'instrument', 'optimize'], |
'default': 'off', |
@@ -963,10 +952,6 @@ |
if 'msvcltcg' in ARGUMENTS: |
print "Warning: forcing msvcltcg on as it is required for pgo (%s)" % options['pgo'] |
options['msvcltcg'] = 'on' |
- if (options['armvariant'] == 'none' and options['arch'] == 'arm'): |
- options['armvariant'] = 'arm' |
- if (options['armvariant'] != 'none' and options['arch'] != 'arm'): |
- options['armvariant'] = 'none' |
if options['arch'] == 'mips': |
if ('regexp' in ARGUMENTS) and options['regexp'] == 'native': |
# Print a warning if native regexp is specified for mips |