summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 05:49:31 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 05:49:31 +0000
commitefbeabe9eec1dd366e08fe9ff7f397c75f48ad62 (patch)
tree2b8fbd3d54815034c3cb558ad2f44390c7e6e015
parent1676349f6dee88c0040f112b57ff5a58dbaabcf5 (diff)
downloadopenssl-efbeabe9eec1dd366e08fe9ff7f397c75f48ad62.tar.gz
Update makefiles after merge of Chromium at 235046
This commit was generated by merge_from_chromium.py. Change-Id: I3133f90322850ccae3fffa89c0c606f07e937928
-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, 0 insertions, 12 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 0451d76..163c72c 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -588,7 +588,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-fno-tree-sra \
@@ -687,7 +686,6 @@ 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 9a3ac9c..1589f13 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -586,7 +586,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-EL \
@@ -682,7 +681,6 @@ 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 28850f7..845a045 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -590,7 +590,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-m32 \
@@ -696,7 +695,6 @@ 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 0451d76..163c72c 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -588,7 +588,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-fno-tree-sra \
@@ -687,7 +686,6 @@ 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 9a3ac9c..1589f13 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -586,7 +586,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-EL \
@@ -682,7 +681,6 @@ 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 28850f7..845a045 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -590,7 +590,6 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-m32 \
@@ -696,7 +695,6 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
- -g \
-w \
-Wno-format \
-m32 \