projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client
/
src
/
trusted
/
service_runtime
/
build.scons
diff --git
a/src/native_client/src/trusted/service_runtime/build.scons
b/src/native_client/src/trusted/service_runtime/build.scons
index
50bbd2f
..
52030d7
100644
(file)
--- a/
src/native_client/src/trusted/service_runtime/build.scons
+++ b/
src/native_client/src/trusted/service_runtime/build.scons
@@
-138,16
+138,6
@@
elif env.Bit('build_arm'):
'arch/arm/nacl_syscall.S',
'arch/arm/tramp_arm.S',
]
'arch/arm/nacl_syscall.S',
'arch/arm/tramp_arm.S',
]
- if env.Bit('target_arm_thumb2'):
- thumb2_env = env.Clone()
- thumb2_env.Append(ASFLAGS=['-mthumb'])
- ldr_inputs += [
- thumb2_env.DualObject('arch/arm/tramp_arm_thumb2.S'),
- ]
- else:
- ldr_inputs += [
- 'arch/arm/tramp_arm.S',
- ]
elif env.Bit('build_mips32'):
ldr_inputs += [
'arch/mips/nacl_app.c',
elif env.Bit('build_mips32'):
ldr_inputs += [
'arch/mips/nacl_app.c',
@@
-327,6
+317,7
@@
if env.Bit('windows'):
sel_ldr_libs = ['sel',
'sel_main',
sel_ldr_libs = ['sel',
'sel_main',
+ 'desc_cacheability',
'env_cleanser',
'nacl_error_code',
'manifest_proxy',
'env_cleanser',
'nacl_error_code',
'manifest_proxy',