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

Unified Diff: gypfiles/toolchain.gypi

Issue 2171303002: MIPS: Fix '[turbofan] Prevent storing signalling NaNs into holey double arrays.' (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Add mac cross-build conditions. Created 4 years, 5 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
« no previous file with comments | « no previous file | src/compiler/mips/code-generator-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gypfiles/toolchain.gypi
diff --git a/gypfiles/toolchain.gypi b/gypfiles/toolchain.gypi
index 4778b110614496aee8935c131141dd37b447a160..ec1e126d34d5ad64fd3d27110b3067ede3b7284a 100644
--- a/gypfiles/toolchain.gypi
+++ b/gypfiles/toolchain.gypi
@@ -364,28 +364,49 @@
],
'cflags': ['-march=i586'],
}], # v8_target_arch=="x87"
- ['(v8_target_arch=="mips" or v8_target_arch=="mipsel" \
- or v8_target_arch=="mips64" or v8_target_arch=="mips64el") \
- and v8_target_arch==target_arch', {
+ ['v8_target_arch=="mips" or v8_target_arch=="mipsel" \
+ or v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
'target_conditions': [
['_toolset=="target"', {
- # Target built with a Mips CXX compiler.
- 'variables': {
- 'ldso_path%': '<!(/bin/echo -n $LDSO_PATH)',
- 'ld_r_path%': '<!(/bin/echo -n $LD_R_PATH)',
- },
'conditions': [
- ['ldso_path!=""', {
- 'ldflags': ['-Wl,--dynamic-linker=<(ldso_path)'],
- }],
- ['ld_r_path!=""', {
- 'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
+ ['v8_target_arch==target_arch', {
+ # Target built with a Mips CXX compiler.
+ 'conditions': [
Michael Achenbach 2016/07/26 06:32:29 These leftover conditions led to the drmemory erro
balazs.kilvady 2016/07/26 15:58:23 Thanks for catching it, I am going to upload a new
+ ],
+ 'variables': {
+ 'ldso_path%': '<!(/bin/echo -n $LDSO_PATH)',
+ 'ld_r_path%': '<!(/bin/echo -n $LD_R_PATH)',
+ },
+ 'conditions': [
+ ['ldso_path!=""', {
+ 'ldflags': ['-Wl,--dynamic-linker=<(ldso_path)'],
+ }],
+ ['ld_r_path!=""', {
+ 'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
+ }],
+ [ 'clang==1', {
+ 'cflags': ['-integrated-as'],
+ }],
+ ['OS!="mac"', {
+ 'defines': ['_MIPS_TARGET_HW',],
+ }, {
+ 'defines': ['_MIPS_TARGET_SIMULATOR',],
+ }],
+ ],
+ }, {
+ 'defines': ['_MIPS_TARGET_SIMULATOR',],
}],
- [ 'clang==1', {
- 'cflags': ['-integrated-as'],
+ ],
+ }], #'_toolset=="target"
+ ['_toolset=="host"', {
+ 'conditions': [
+ ['v8_target_arch==target_arch and OS!="mac"', {
+ 'defines': ['_MIPS_TARGET_HW',],
+ }, {
+ 'defines': ['_MIPS_TARGET_SIMULATOR',],
}],
],
- }],
+ }], #'_toolset=="host"
],
}],
['v8_target_arch=="mips"', {
« no previous file with comments | « no previous file | src/compiler/mips/code-generator-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698