summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-03 12:02:55 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-03 12:05:35 +0100
commitf7060e27768c550ace7ec48ad8c093466db52dfa (patch)
tree43a297e3fcc3fd81c7637fcbe8b31b3d02fd337d /SConstruct
parentf4f2cc060fdf724f592c425cced19bc9a3fc7e40 (diff)
downloadandroid_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.tar.gz
android_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.tar.bz2
android_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.zip
Update V8 to r4730 as required by WebKit r60469
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct15
1 files changed, 0 insertions, 15 deletions
diff --git a/SConstruct b/SConstruct
index 1056de7d..cf6b57d7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -210,12 +210,6 @@ LIBRARY_FLAGS = {
'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 @@ SIMPLE_OPTIONS = {
'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 @@ def PostprocessOptions(options, os):
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