Update makefiles after merge of Chromium at 233887

This commit was generated by merge_from_chromium.py.

Change-Id: Iedc04a5bc5c03295e2b43ef6872a4bff13dc46d9
diff --git a/tools/gyp/mksnapshot.arm.host.darwin-arm.mk b/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
index 8bef2a3..715bc28 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 c65146a..1cb8775 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 83c282c..f3b48e4 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 d4beec0..5a20614 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 d2c4ef9..efb1c80 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 3aaf3ef..30e7fb4 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 563c429..99411ba 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 471aef6..6b6a88c 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 02bb00e..fa63645 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 77f9e91..3aa8a0a 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 2e35ffb..94d0e05 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 21e9801..c1e1559 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 20f72db..a507f29 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 352c8cd..7eebfa8 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 692b566..90b4768 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 53968a6..efda3d6 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 032c68d..b1f4f6c 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 4426209..7c1809f 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 1552b4d..1d9f129 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 021dac8..d1dc13e 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 40319fb..5ed996a 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 6ffbe0b..213a08e 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 bcd6632..92a7e84 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 f86981e..d9d2b3f 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 5507aba..42268a9 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 7a1fcf9..0fdba00 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 c605950..0ac8d74 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 5507aba..42268a9 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 7a1fcf9..0fdba00 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 c605950..0ac8d74 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 \