Chromium Code Reviews| Index: test/cctest/BUILD.gn |
| diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn |
| index 71e9eb0d2c0296a68f3a22a1b416efea04cb9f18..649a7963bfbe68819f00d388c1e2efa23c203844 100644 |
| --- a/test/cctest/BUILD.gn |
| +++ b/test/cctest/BUILD.gn |
| @@ -47,13 +47,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 = [ |
| @@ -62,15 +55,6 @@ v8_executable("cctest") { |
| ] |
| # 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"", { |
|
vogelheim
2016/07/22 09:45:25
.. Since you now had ldflags, this would trivially
Michael Achenbach
2016/07/22 09:49:45
Like to keep it separate as I have no clue about A
|
| # "ldflags": [ "-Wl,-bbigtoc" ], |
| #}], |
| @@ -90,15 +74,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" || |
|
vogelheim
2016/07/22 09:45:25
style nitpick: please unify whitespace around the
Michael Achenbach
2016/07/22 09:49:45
Done.
|
| + 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", |
| ] |