summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-08 12:46:38 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-08 12:46:38 +0000
commit16bc225f6c98edf2070af454a67ae14a06038acf (patch)
tree9e372f7db0dd3299b0a1c594c3ef1cd0e65d33e3
parent955364101ab8d8ce27f9efa0c839f18fe92da7d9 (diff)
downloadopenssl-16bc225f6c98edf2070af454a67ae14a06038acf.tar.gz
Update makefiles after merge of Chromium at 233887
This commit was generated by merge_from_chromium.py. Change-Id: Iea787c967188f24f3cd62597201325e130a97724
-rw-r--r--openssl.target.darwin-arm.mk2
-rw-r--r--openssl.target.darwin-mips.mk2
-rw-r--r--openssl.target.darwin-x86.mk2
-rw-r--r--openssl.target.linux-arm.mk2
-rw-r--r--openssl.target.linux-mips.mk2
-rw-r--r--openssl.target.linux-x86.mk2
6 files changed, 12 insertions, 0 deletions
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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-fno-tree-sra \
@@ -686,6 +687,7 @@ MY_CFLAGS_Release := \
-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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-EL \
@@ -681,6 +682,7 @@ MY_CFLAGS_Release := \
-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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-m32 \
@@ -695,6 +696,7 @@ MY_CFLAGS_Release := \
-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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-fno-tree-sra \
@@ -686,6 +687,7 @@ MY_CFLAGS_Release := \
-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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-EL \
@@ -681,6 +682,7 @@ MY_CFLAGS_Release := \
-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 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-m32 \
@@ -695,6 +696,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -g \
-w \
-Wno-format \
-m32 \