Commit 5ed0940f authored by wtc's avatar wtc Committed by Commit bot

Support MIPS DSP application-specific extension (ASE) in GYP.

This is the GYP counterpart of the GN changes in
https://codereview.chromium.org/1008603002/.

R=mtklein@google.com,petarj@mips.com,reed@google.com
BUG=none

Review URL: https://codereview.chromium.org/1010773007

Cr-Commit-Position: refs/heads/master@{#321256}
parent e90d505d
...@@ -107,14 +107,13 @@ ...@@ -107,14 +107,13 @@
target_arch != "arm64" and target_arch != "mips64el"', { target_arch != "arm64" and target_arch != "mips64el"', {
'sources': [ 'sources': [
'ext/convolver_SSE2.cc', 'ext/convolver_SSE2.cc',
'ext/convolver_SSE2.h',
], ],
}], }],
[ 'target_arch == "mipsel"',{ [ 'target_arch == "mipsel" and mips_dsp_rev >= 2',{
'cflags': [
'-fomit-frame-pointer',
],
'sources': [ 'sources': [
'ext/convolver_mips_dspr2.cc', 'ext/convolver_mips_dspr2.cc',
'ext/convolver_mips_dspr2.h',
], ],
}], }],
], ],
......
...@@ -64,11 +64,16 @@ ...@@ -64,11 +64,16 @@
}], }],
[ 'target_arch == "arm"', { [ 'target_arch == "arm"', {
'conditions': [ 'conditions': [
[ 'arm_version >= 7', {
'sources': [ '<@(armv7_sources)' ],
}, { # arm_version < 7
'sources': [ '<@(none_sources)' ],
}],
[ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
'dependencies': [ 'dependencies': [
'skia_opts_neon', 'skia_opts_neon',
] ]
}], }],
], ],
# The assembly uses the frame pointer register (r7 in Thumb/r11 in # The assembly uses the frame pointer register (r7 in Thumb/r11 in
# ARM), the compiler doesn't like that. Explicitly remove the # ARM), the compiler doesn't like that. Explicitly remove the
...@@ -83,13 +88,17 @@ ...@@ -83,13 +88,17 @@
'-fomit-frame-pointer', '-fomit-frame-pointer',
], ],
}], }],
[ 'target_arch == "arm" and arm_version < 7', { [ 'target_arch == "mipsel"',{
'sources': [ '<@(none_sources)' ], 'cflags': [ '-fomit-frame-pointer' ],
}], 'conditions': [
[ 'target_arch == "arm" and arm_version >= 7', { [ 'mips_dsp_rev >= 1', {
'sources': [ '<@(armv7_sources)' ], 'sources': [ '<@(mips_dsp_sources)' ],
}, { # mips_dsp_rev == 0
'sources': [ '<@(none_sources)' ],
}],
],
}], }],
[ 'target_arch == "mipsel" or target_arch == "mips64el"',{ [ 'target_arch == "mips64el"',{
'cflags': [ '-fomit-frame-pointer' ], 'cflags': [ '-fomit-frame-pointer' ],
'sources': [ '<@(none_sources)' ], 'sources': [ '<@(none_sources)' ],
}], }],
......
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