Update makefiles after merge of Chromium at 234542

This commit was generated by merge_from_chromium.py.

Change-Id: I8c191fd2d09ffcd3f65ee062a45af67b5670cd8d
diff --git a/tools/gyp/mksnapshot.arm.host.darwin-arm.mk b/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
index 54e7136..0e1b419 100644
--- a/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
+++ b/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
@@ -46,6 +46,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -109,6 +110,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/mksnapshot.arm.host.linux-arm.mk b/tools/gyp/mksnapshot.arm.host.linux-arm.mk
index fec6e80..4e714da 100644
--- a/tools/gyp/mksnapshot.arm.host.linux-arm.mk
+++ b/tools/gyp/mksnapshot.arm.host.linux-arm.mk
@@ -46,6 +46,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -109,6 +110,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk b/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
index 2de626d..ac27888 100644
--- a/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
+++ b/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
@@ -46,6 +46,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -107,6 +108,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/mksnapshot.ia32.host.linux-x86.mk b/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
index 25a6e62..4724a53 100644
--- a/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
+++ b/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
@@ -46,6 +46,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -107,6 +108,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk b/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
index e18dfdc..a73286d 100644
--- a/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -111,6 +112,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk b/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
index aeab8db..6378743 100644
--- a/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
+++ b/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -111,6 +112,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.arm.host.darwin-arm.mk b/tools/gyp/v8_base.arm.host.darwin-arm.mk
index db2ce53..2537b60 100644
--- a/tools/gyp/v8_base.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.host.darwin-arm.mk
@@ -207,6 +207,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -275,6 +276,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.arm.host.linux-arm.mk b/tools/gyp/v8_base.arm.host.linux-arm.mk
index b7a3b41..c029dee 100644
--- a/tools/gyp/v8_base.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.host.linux-arm.mk
@@ -207,6 +207,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -276,6 +277,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.arm.target.darwin-arm.mk b/tools/gyp/v8_base.arm.target.darwin-arm.mk
index 7bf6c73..3203aa6 100644
--- a/tools/gyp/v8_base.arm.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.target.darwin-arm.mk
@@ -207,6 +207,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -305,6 +306,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
diff --git a/tools/gyp/v8_base.arm.target.linux-arm.mk b/tools/gyp/v8_base.arm.target.linux-arm.mk
index 936c2b0..554ce23 100644
--- a/tools/gyp/v8_base.arm.target.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.target.linux-arm.mk
@@ -207,6 +207,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -305,6 +306,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
diff --git a/tools/gyp/v8_base.ia32.host.darwin-x86.mk b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
index c71994e..a8e0a1c 100644
--- a/tools/gyp/v8_base.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
@@ -205,6 +205,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -271,6 +272,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.ia32.host.linux-x86.mk b/tools/gyp/v8_base.ia32.host.linux-x86.mk
index a25536c..8b968a3 100644
--- a/tools/gyp/v8_base.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.linux-x86.mk
@@ -205,6 +205,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -272,6 +273,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.ia32.target.darwin-x86.mk b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
index 01ddae3..a663b90 100644
--- a/tools/gyp/v8_base.ia32.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
@@ -204,6 +204,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -301,6 +302,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
diff --git a/tools/gyp/v8_base.ia32.target.linux-x86.mk b/tools/gyp/v8_base.ia32.target.linux-x86.mk
index de22e3d..5cb87fe 100644
--- a/tools/gyp/v8_base.ia32.target.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.linux-x86.mk
@@ -204,6 +204,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -301,6 +302,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
diff --git a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
index eb30b42..9d7d8a2 100644
--- a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
@@ -208,6 +208,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -277,6 +278,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.mipsel.host.linux-mips.mk b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
index 30d3386..2c39bb9 100644
--- a/tools/gyp/v8_base.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
@@ -208,6 +208,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -278,6 +279,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
index 8e010ad..20627ca 100644
--- a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
@@ -208,6 +208,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -306,6 +307,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
diff --git a/tools/gyp/v8_base.mipsel.target.linux-mips.mk b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
index b73c3bc..e79c927 100644
--- a/tools/gyp/v8_base.mipsel.target.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
@@ -208,6 +208,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -306,6 +307,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
diff --git a/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
index 080d866..cd4d164 100644
--- a/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -110,6 +111,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
index 1a45c1a..749e9aa 100644
--- a/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -110,6 +111,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
index 71adab3..7348820 100644
--- a/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -108,6 +109,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
index cf259ea..b8e4087 100644
--- a/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
@@ -47,6 +47,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -108,6 +109,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
index f74ef5c..22be02f 100644
--- a/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
@@ -48,6 +48,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -112,6 +113,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
index 50a1314..680ee8b 100644
--- a/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
@@ -48,6 +48,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-Os \
@@ -112,6 +113,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-fno-ident \
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk
index 9f32ec2..a722a42 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk
@@ -58,6 +58,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -152,6 +153,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk
index a85c602..436b04d 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk
@@ -59,6 +59,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -153,6 +154,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk
index 552ee95..f64e58f 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk
@@ -57,6 +57,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -150,6 +151,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk
index 9f32ec2..a722a42 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm.mk
@@ -58,6 +58,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -152,6 +153,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk
index a85c602..436b04d 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips.mk
@@ -59,6 +59,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -153,6 +154,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk
index 552ee95..f64e58f 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86.mk
@@ -57,6 +57,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -150,6 +151,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \