GN: Fix Debug flags. Fix Windows build.

R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2425043002 .
This commit is contained in:
Zach Anderson
2016-10-17 12:58:24 -07:00
parent 99ce88f8bc
commit 71a84cfed6
3 changed files with 14 additions and 5 deletions
+3 -3
View File
@@ -720,7 +720,7 @@ config("optimize") {
if (is_win) {
# Favor size over speed, /O1 must be before the common flags. The GYP
# build also specifies /Os and /GF but these are implied by /O1.
cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ]
cflags = [ "/O2" ] + common_optimize_on_cflags + [ "/Oi" ]
} else if (is_android) {
cflags = [ "-Os" ] + common_optimize_on_cflags # Favor size over speed.
} else {
@@ -733,9 +733,9 @@ config("optimize") {
config("no_optimize") {
if (is_win) {
cflags = [
"/Od", # Disable optimization.
"/O2", # Do some optimizations.
"/Oy-", # Disable omitting frame pointers, must be after /O2.
"/Ob0", # Disable all inlining (on by default).
"/RTC1", # Runtime checks for stack frame and uninitialized variables.
]
} else if (is_android) {
# On Android we kind of optimize some things that don't affect debugging
+8
View File
@@ -298,6 +298,14 @@ typedef simd128_value_t fpu_register_t;
#error Automatic compiler detection failed.
#endif
#ifdef _MSC_VER
#define DART_PRETTY_FUNCTION __FUNCSIG__
#elif __GNUC__
#define DART_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else
#error Automatic compiler detection failed.
#endif
#if !defined(TARGET_ARCH_MIPS)
#if !defined(TARGET_ARCH_ARM)
#if !defined(TARGET_ARCH_X64)
+3 -2
View File
@@ -5,6 +5,7 @@
#include <map>
#include <vector>
#include "platform/globals.h"
#include "vm/flags.h"
#include "vm/kernel.h"
#include "vm/os.h"
@@ -12,11 +13,11 @@
#if defined(DEBUG)
#define TRACE_READ_OFFSET() do { \
if (FLAG_trace_kernel_binary) \
reader->DumpOffset(__PRETTY_FUNCTION__); \
reader->DumpOffset(DART_PRETTY_FUNCTION); \
} while (0)
#define TRACE_WRITE_OFFSET() do { \
if (FLAG_trace_kernel_binary) \
writer->DumpOffset(__PRETTY_FUNCTION__); \
writer->DumpOffset(DART_PRETTY_FUNCTION); \
} while (0)
#else
#define TRACE_READ_OFFSET()