summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-07-03 09:11:37 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-07-03 09:11:37 +0000
commitae7ff6f0516e43ed3b6fdc9af89f2aa1b23d8eeb (patch)
tree3a78c4d5553ca01433796318a546d9a58ea53c3f
parent3d9de35682a147b82d8af1e474b78d4ca80a868d (diff)
downloadangle_dx11-ae7ff6f0516e43ed3b6fdc9af89f2aa1b23d8eeb.tar.gz
Update makefiles after merge of Chromium at r209934
This commit was generated by merge_from_chromium.py. Change-Id: Ic465319bcffe99342cba92d3940ea0c5f3e9c58a
Diffstat
-rw-r--r--src/preprocessor.target.darwin-arm.mk4
-rw-r--r--src/preprocessor.target.darwin-mips.mk4
-rw-r--r--src/preprocessor.target.darwin-x86.mk4
-rw-r--r--src/preprocessor.target.linux-arm.mk4
-rw-r--r--src/preprocessor.target.linux-mips.mk4
-rw-r--r--src/preprocessor.target.linux-x86.mk4
-rw-r--r--src/translator_common.target.darwin-arm.mk4
-rw-r--r--src/translator_common.target.darwin-mips.mk4
-rw-r--r--src/translator_common.target.darwin-x86.mk4
-rw-r--r--src/translator_common.target.linux-arm.mk4
-rw-r--r--src/translator_common.target.linux-mips.mk4
-rw-r--r--src/translator_common.target.linux-x86.mk4
-rw-r--r--src/translator_glsl.target.darwin-arm.mk4
-rw-r--r--src/translator_glsl.target.darwin-mips.mk4
-rw-r--r--src/translator_glsl.target.darwin-x86.mk4
-rw-r--r--src/translator_glsl.target.linux-arm.mk4
-rw-r--r--src/translator_glsl.target.linux-mips.mk4
-rw-r--r--src/translator_glsl.target.linux-x86.mk4
18 files changed, 54 insertions, 18 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 127aa857..a40116c8 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -217,6 +217,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -235,7 +236,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 6b7fcdd7..9cbde2b8 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -213,6 +213,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -229,7 +230,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 381b9296..25cc6efe 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -219,6 +219,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -235,7 +236,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 127aa857..a40116c8 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -217,6 +217,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -235,7 +236,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 6b7fcdd7..9cbde2b8 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -213,6 +213,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -229,7 +230,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 381b9296..25cc6efe 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -219,6 +219,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -235,7 +236,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index d9a16af6..b1521f75 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -248,6 +248,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -266,7 +267,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk
index 19445433..73d9fbbc 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator_common.target.darwin-mips.mk
@@ -244,6 +244,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -260,7 +261,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index 65fe19c8..1fbb2edb 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -250,6 +250,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -266,7 +267,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index d9a16af6..b1521f75 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -248,6 +248,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -266,7 +267,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
index 19445433..73d9fbbc 100644
--- a/src/translator_common.target.linux-mips.mk
+++ b/src/translator_common.target.linux-mips.mk
@@ -244,6 +244,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -260,7 +261,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index 65fe19c8..1fbb2edb 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -250,6 +250,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -266,7 +267,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index b8b08042..df5792b2 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -220,6 +220,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -238,7 +239,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
index 3c3797d6..5a074f0e 100644
--- a/src/translator_glsl.target.darwin-mips.mk
+++ b/src/translator_glsl.target.darwin-mips.mk
@@ -216,6 +216,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -232,7 +233,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index c24b2d65..95e0906a 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -222,6 +222,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -238,7 +239,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index b8b08042..df5792b2 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -220,6 +220,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -238,7 +239,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
index 3c3797d6..5a074f0e 100644
--- a/src/translator_glsl.target.linux-mips.mk
+++ b/src/translator_glsl.target.linux-mips.mk
@@ -216,6 +216,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -232,7 +233,8 @@ LOCAL_LDFLAGS_Release := \
-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/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index c24b2d65..95e0906a 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -222,6 +222,7 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -238,7 +239,8 @@ LOCAL_LDFLAGS_Release := \
-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))
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 13:44:31 +0000