Update makefiles after merge of Chromium at 233887

This commit was generated by merge_from_chromium.py.

Change-Id: Iea787c967188f24f3cd62597201325e130a97724
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 163c72c..0451d76 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -588,6 +588,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-fno-tree-sra \
@@ -686,6 +687,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-fno-tree-sra \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 1589f13..9a3ac9c 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -586,6 +586,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-EL \
@@ -681,6 +682,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-EL \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 845a045..28850f7 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -590,6 +590,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-m32 \
@@ -695,6 +696,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-m32 \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 163c72c..0451d76 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -588,6 +588,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-fno-tree-sra \
@@ -686,6 +687,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-fno-tree-sra \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 1589f13..9a3ac9c 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -586,6 +586,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-EL \
@@ -681,6 +682,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-EL \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 845a045..28850f7 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -590,6 +590,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-m32 \
@@ -695,6 +696,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-w \
 	-Wno-format \
 	-m32 \