Commit 45d6909e authored by akos.palfi's avatar akos.palfi Committed by Commit bot

MIPS: Fix mksnapshot on big-endian.

Paritally revert standalone.gypi changes in a451bd1a and introduce a new separate variable for the mkpeephole.

On big-endian MIPS, qemu is used to build the snapshot,
because there's no simulator support for big-endian MIPS.

BUG=

Committed: https://crrev.com/928d2395c3fdf836cf9961cde96e6b274a6b1e20
Review-Url: https://codereview.chromium.org/2172653002
Cr-Original-Commit-Position: refs/heads/master@{#38103}
Cr-Commit-Position: refs/heads/master@{#38165}
parent 5c1c023b
......@@ -238,13 +238,24 @@
(v8_target_arch=="arm64" and host_arch!="arm64") or \
(v8_target_arch=="mipsel" and host_arch!="mipsel") or \
(v8_target_arch=="mips64el" and host_arch!="mips64el") or \
(v8_target_arch=="mips" and host_arch!="mips") or \
(v8_target_arch=="x64" and host_arch!="x64") or \
(OS=="android" or OS=="qnx")', {
'want_separate_host_toolset': 1,
}, {
'want_separate_host_toolset': 0,
}],
['(v8_target_arch=="arm" and host_arch!="arm") or \
(v8_target_arch=="arm64" and host_arch!="arm64") or \
(v8_target_arch=="mipsel" and host_arch!="mipsel") or \
(v8_target_arch=="mips64el" and host_arch!="mips64el") or \
(v8_target_arch=="mips" and host_arch!="mips") or \
(v8_target_arch=="mips64" and host_arch!="mips64") or \
(v8_target_arch=="x64" and host_arch!="x64") or \
(OS=="android" or OS=="qnx")', {
'want_separate_host_toolset_mkpeephole': 1,
}, {
'want_separate_host_toolset_mkpeephole': 0,
}],
['OS == "win"', {
'os_posix%': 0,
}, {
......
......@@ -71,6 +71,7 @@
# Chrome needs this definition unconditionally. For standalone V8 builds,
# it's handled in gypfiles/standalone.gypi.
'want_separate_host_toolset%': 1,
'want_separate_host_toolset_mkpeephole%': 1,
# Toolset the shell binary should be compiled for. Possible values are
# 'host' and 'target'.
......
......@@ -399,7 +399,7 @@
'action': ['<(mkpeephole_exec)', '<(INTERMEDIATE_DIR)/bytecode-peephole-table.cc' ],
'process_outputs_as_sources': 1,
'conditions': [
['want_separate_host_toolset==1', {
['want_separate_host_toolset_mkpeephole==1', {
'dependencies': ['mkpeephole#host'],
'toolsets': ['host'],
}, {
......@@ -1794,7 +1794,8 @@
'base/utils/random-number-generator.h',
],
'conditions': [
['want_separate_host_toolset==1', {
['want_separate_host_toolset==1 or \
want_separate_host_toolset_mkpeephole==1', {
'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
......@@ -2380,7 +2381,7 @@
'interpreter/mkpeephole.cc'
],
'conditions': [
['want_separate_host_toolset==1', {
['want_separate_host_toolset_mkpeephole==1', {
'toolsets': ['host'],
}, {
'toolsets': ['target'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment