Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1867)

Unified Diff: src/trusted/service_runtime/build.scons

Issue 10919162: [MIPS] Implementation of sel_ldr for MIPS architecture. (Closed) Base URL: http://src.chromium.org/native_client/trunk/src/native_client/
Patch Set: Second update per Mark's comments. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/trusted/service_runtime/build.scons
diff --git a/src/trusted/service_runtime/build.scons b/src/trusted/service_runtime/build.scons
index 8df1fe09d06acf0eab10d4297662ed551265ab02..f6cf11ae49edc49bf5629ede4f5d0c3271e0a71f 100644
--- a/src/trusted/service_runtime/build.scons
+++ b/src/trusted/service_runtime/build.scons
@@ -137,6 +137,18 @@ elif env.Bit('build_arm'):
ldr_inputs += [
'arch/arm/tramp_arm.S',
]
+elif env.Bit('build_mips32'):
+ ldr_inputs += [
+ 'arch/mips/nacl_app.c',
+ 'arch/mips/nacl_switch_to_app_mips.c',
+ 'arch/mips/sel_rt.c',
+ 'arch/mips/nacl_tls.c',
+ 'arch/mips/sel_ldr_mips.c',
+ 'arch/mips/sel_addrspace_mips.c',
+ 'arch/mips/nacl_switch.S',
+ 'arch/mips/nacl_syscall.S',
+ 'arch/mips/tramp_mips.S',
+ ]
if env.Bit('windows'):
ldr_inputs += [
@@ -180,6 +192,10 @@ elif env.Bit('linux'):
ldr_inputs += [
'linux/arm/sel_segments.c',
]
+ elif env.Bit('build_mips32'):
+ ldr_inputs += [
+ 'linux/mips/sel_segments.c',
+ ]
# -------------------------------------------------------------
@@ -217,8 +233,7 @@ if env.Bit('linux'):
if env.Bit('target_arm'):
ldr_inputs += ['linux/nacl_signal_arm.c']
elif env.Bit('target_mips32'):
- # TODO(petarj): Add support for MIPS.
- pass
+ ldr_inputs += ['linux/nacl_signal_mips.c']
elif env.Bit('target_x86_32'):
ldr_inputs += ['linux/nacl_signal_32.c']
elif env.Bit('target_x86_64'):
@@ -396,6 +411,9 @@ if env.Bit('linux') and not env.Bit('built_elsewhere'):
elif env.Bit('target_arm'):
ld_emul = 'armelf_linux_eabi'
reserve_top = '0x40002000'
+ elif env.Bit('target_mips32'):
+ ld_emul = 'elf32ltsmip'
+ reserve_top = '0x40002000'
bootstrap_obj = bootstrap_env.ComponentObject('linux/nacl_bootstrap.c')
bootstrap_raw = bootstrap_env.Command(
@@ -615,6 +633,7 @@ env.AddNodeToTestSuite(node, ['small_tests'], 'run_nacl_resource_test')
if env.Bit('posix'):
if (not env.Bit('coverage_enabled') and
not env.Bit('target_arm') and
+ not env.Bit('target_mips32') and
not env.IsRunningUnderValgrind()):
nacl_signal_exe = env.ComponentProgram(
'nacl_signal_unittest', 'nacl_signal_unittest.c',

Powered by Google App Engine
This is Rietveld 408576698