Commit a4dbaf1c authored by machenbach's avatar machenbach Committed by Commit bot

[gn] Migrate more custom cflags from gyp to gn

BUG=chromium:474921

Review-Url: https://codereview.chromium.org/2171263002
Cr-Commit-Position: refs/heads/master@{#38000}
parent 682a41db
......@@ -14,9 +14,7 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
v8_executable("cctest") {
testonly = true
sources = [
"$target_gen_dir/resources.cc",
] + gypi_values.cctest_sources
sources = [ "$target_gen_dir/resources.cc" ] + gypi_values.cctest_sources
if (v8_current_cpu == "arm") {
sources += gypi_values.cctest_sources_arm
......@@ -47,13 +45,6 @@ v8_executable("cctest") {
sources += [ "test-platform-linux.cc" ]
} else if (is_win) {
sources += [ "test-platform-win32.cc" ]
# TODO(machenbach): Translate from gyp.
# "msvs_settings": {
# "VCCLCompilerTool": {
# # MSVS wants this for gay-{precision,shortest}.cc.
# "AdditionalOptions": ["/bigobj"],
# },
# },
}
configs = [
......@@ -61,15 +52,6 @@ v8_executable("cctest") {
"../..:internal_config_base",
]
# TODO(machenbach): Translate from gyp.
#['v8_current_cpu=="ppc" or v8_current_cpu=="ppc64" \
# or v8_current_cpu=="arm" or v8_current_cpu=="arm64" \
# or v8_current_cpu=="s390" or v8_current_cpu=="s390x"', {
# # disable fmadd/fmsub so that expected results match generated code in
# # RunFloat64MulAndFloat64Add1 and friends.
# 'cflags': ['-ffp-contract=off'],
#}],
# TODO(machenbach): Translate from gyp.
#["OS=="aix"", {
# "ldflags": [ "-Wl,-bbigtoc" ],
......@@ -90,15 +72,29 @@ v8_executable("cctest") {
deps += [ "../..:v8" ]
}
cflags = []
ldflags = []
if (v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
v8_current_cpu == "arm" || v8_current_cpu == "arm64" ||
v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
# Disable fmadd/fmsub so that expected results match generated code in
# RunFloat64MulAndFloat64Add1 and friends.
cflags += [ "-ffp-contract=off" ]
}
if (is_win) {
# This warning is benignly triggered by the U16 and U32 macros in
# bytecode-utils.h.
# C4309: 'static_cast': truncation of constant value
cflags = [ "/wd4309" ]
cflags += [ "/wd4309" ]
# MSVS wants this for gay-{precision,shortest}.cc.
cflags += [ "/bigobj" ]
# Suppress warnings about importing locally defined symbols.
if (is_component_build) {
ldflags = [
ldflags += [
"/ignore:4049",
"/ignore:4217",
]
......
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