Skip to content

V
V8
Commit 0bae3c39 authored by Ilija.Pavlovic's avatar Ilija.Pavlovic Committed by Commit bot
Browse files
Options

MIPS: Enable v8 compilation with CLANG. 

Updated toolchain.gypi to support v8 using CLANG on MIPS. These changes
include using integrated assembler with CLANG, and disabling options
used by GCC which are not supported by CLANG.

TEST=
BUG=

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

Cr-Commit-Position: refs/heads/master@{#32780}
parent 5964152c
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 11 deletions
build/toolchain.gypi
View file @ 0bae3c39
...@@ -357,6 +357,9 @@ ...@@ -357,6 +357,9 @@
['ld_r_path!=""', { ['ld_r_path!=""', {
'ldflags': ['-Wl,--rpath=<(ld_r_path)'], 'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
}], }],
[ 'clang==1', {
'cflags': ['-integrated-as'],
}],
], ],
}], }],
], ],
...@@ -406,7 +409,12 @@ ...@@ -406,7 +409,12 @@
'FPU_MODE_FP64', 'FPU_MODE_FP64',
], ],
'cflags!': ['-mfp32', '-mfpxx'], 'cflags!': ['-mfp32', '-mfpxx'],
'cflags': ['-mips32r6', '-Wa,-mips32r6'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32r6'],
}],
],
'cflags': ['-mips32r6'],
'ldflags': ['-mips32r6'], 'ldflags': ['-mips32r6'],
}], }],
['mips_arch_variant=="r2"', { ['mips_arch_variant=="r2"', {
...@@ -433,7 +441,12 @@ ...@@ -433,7 +441,12 @@
'cflags': ['-mfp32'], 'cflags': ['-mfp32'],
}], }],
], ],
'cflags': ['-mips32r2', '-Wa,-mips32r2'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32r2'],
}],
],
'cflags': ['-mips32r2'],
'ldflags': ['-mips32r2'], 'ldflags': ['-mips32r2'],
}], }],
['mips_arch_variant=="r1"', { ['mips_arch_variant=="r1"', {
...@@ -441,7 +454,12 @@ ...@@ -441,7 +454,12 @@
'FPU_MODE_FP32', 'FPU_MODE_FP32',
], ],
'cflags!': ['-mfp64', '-mfpxx'], 'cflags!': ['-mfp64', '-mfpxx'],
'cflags': ['-mips32', '-Wa,-mips32'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32'],
}],
],
'cflags': ['-mips32'],
'ldflags': ['-mips32'], 'ldflags': ['-mips32'],
}], }],
['mips_arch_variant=="rx"', { ['mips_arch_variant=="rx"', {
...@@ -450,7 +468,12 @@ ...@@ -450,7 +468,12 @@
'FPU_MODE_FPXX', 'FPU_MODE_FPXX',
], ],
'cflags!': ['-mfp64', '-mfp32'], 'cflags!': ['-mfp64', '-mfp32'],
'cflags': ['-mips32', '-Wa,-mips32', '-mfpxx'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32'],
}],
],
'cflags': ['-mips32', '-mfpxx'],
'ldflags': ['-mips32'], 'ldflags': ['-mips32'],
}], }],
], ],
...@@ -589,7 +612,12 @@ ...@@ -589,7 +612,12 @@
'FPU_MODE_FP64', 'FPU_MODE_FP64',
], ],
'cflags!': ['-mfp32', '-mfpxx'], 'cflags!': ['-mfp32', '-mfpxx'],
'cflags': ['-mips32r6', '-Wa,-mips32r6'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32r6'],
}],
],
'cflags': ['-mips32r6'],
'ldflags': ['-mips32r6'], 'ldflags': ['-mips32r6'],
}], }],
['mips_arch_variant=="r2"', { ['mips_arch_variant=="r2"', {
...@@ -616,12 +644,22 @@ ...@@ -616,12 +644,22 @@
'cflags': ['-mfp32'], 'cflags': ['-mfp32'],
}], }],
], ],
'cflags': ['-mips32r2', '-Wa,-mips32r2'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32r2'],
}],
],
'cflags': ['-mips32r2'],
'ldflags': ['-mips32r2'], 'ldflags': ['-mips32r2'],
}], }],
['mips_arch_variant=="r1"', { ['mips_arch_variant=="r1"', {
'cflags!': ['-mfp64', '-mfpxx'], 'cflags!': ['-mfp64', '-mfpxx'],
'cflags': ['-mips32', '-Wa,-mips32'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32'],
}],
],
'cflags': ['-mips32'],
'ldflags': ['-mips32'], 'ldflags': ['-mips32'],
}], }],
['mips_arch_variant=="rx"', { ['mips_arch_variant=="rx"', {
...@@ -630,7 +668,12 @@ ...@@ -630,7 +668,12 @@
'FPU_MODE_FPXX', 'FPU_MODE_FPXX',
], ],
'cflags!': ['-mfp64', '-mfp32'], 'cflags!': ['-mfp64', '-mfp32'],
'cflags': ['-mips32', '-Wa,-mips32', '-mfpxx'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips32'],
}],
],
'cflags': ['-mips32', '-mfpxx'],
'ldflags': ['-mips32'], 'ldflags': ['-mips32'],
}], }],
['mips_arch_variant=="loongson"', { ['mips_arch_variant=="loongson"', {
...@@ -639,7 +682,12 @@ ...@@ -639,7 +682,12 @@
'FPU_MODE_FP32', 'FPU_MODE_FP32',
], ],
'cflags!': ['-mfp64', '-mfpxx'], 'cflags!': ['-mfp64', '-mfpxx'],
'cflags': ['-mips3', '-Wa,-mips3', '-mfp32'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips3'],
}],
],
'cflags': ['-mips3', '-mfp32'],
}], }],
], ],
}, { }, {
...@@ -800,12 +848,22 @@ ...@@ -800,12 +848,22 @@
}], }],
['mips_arch_variant=="r6"', { ['mips_arch_variant=="r6"', {
'defines': ['_MIPS_ARCH_MIPS64R6',], 'defines': ['_MIPS_ARCH_MIPS64R6',],
'cflags': ['-mips64r6', '-mabi=64', '-Wa,-mips64r6'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips64r6'],
}],
],
'cflags': ['-mips64r6', '-mabi=64'],
'ldflags': ['-mips64r6', '-mabi=64'], 'ldflags': ['-mips64r6', '-mabi=64'],
}], }],
['mips_arch_variant=="r2"', { ['mips_arch_variant=="r2"', {
'defines': ['_MIPS_ARCH_MIPS64R2',], 'defines': ['_MIPS_ARCH_MIPS64R2',],
'cflags': ['-mips64r2', '-mabi=64', '-Wa,-mips64r2'], 'conditions': [
[ 'clang==0', {
'cflags': ['-Wa,-mips64r2'],
}],
],
'cflags': ['-mips64r2', '-mabi=64'],
'ldflags': ['-mips64r2', '-mabi=64'], 'ldflags': ['-mips64r2', '-mabi=64'],
}], }],
], ],
......
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