Update makefiles after merge of Chromium at r209934
This commit was generated by merge_from_chromium.py.
Change-Id: I3fa4258840cf3dca54cae845874acbc6f3523267
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 34f31dc..1bc896c 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -789,6 +789,7 @@
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -807,7 +808,8 @@
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index f4a6779..72d5ad7 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -776,6 +776,7 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -792,7 +793,8 @@
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 9d03bc3..9cf8e9b 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -806,6 +806,7 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -822,7 +823,8 @@
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 34f31dc..1bc896c 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -789,6 +789,7 @@
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -807,7 +808,8 @@
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index f4a6779..72d5ad7 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -776,6 +776,7 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -792,7 +793,8 @@
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 9d03bc3..9cf8e9b 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -806,6 +806,7 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -822,7 +823,8 @@
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
