Update makefiles after merge of Chromium at r188317
This commit was generated by merge_from_chromium.py.
Change-Id: I273384565ff235cf5f38b37fa3b854d5ca9c4ce3
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 269507a..6467430 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -47,15 +47,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -67,11 +61,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -125,7 +116,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 62c7829..658f670 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -61,11 +61,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -119,7 +116,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 269507a..6467430 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -47,15 +47,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -67,11 +61,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -125,7 +116,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 62c7829..658f670 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -61,11 +61,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -119,7 +116,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index 2032c8f..ad60a11 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -71,15 +71,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -91,11 +85,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -152,7 +143,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index aecfd13..157dd09 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -85,11 +85,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -146,7 +143,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index 2032c8f..ad60a11 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -71,15 +71,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -91,11 +85,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -152,7 +143,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index aecfd13..157dd09 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -85,11 +85,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -146,7 +143,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index 73a6929..95850b5 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -44,15 +44,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -64,11 +58,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -125,7 +116,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index 31db2e4..ab880d0 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -58,11 +58,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -119,7 +116,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index 73a6929..95850b5 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -44,15 +44,9 @@
-pipe \
-fPIC \
-Wno-format \
- -mthumb \
- -march=armv7-a \
- -mtune=cortex-a8 \
- -mfloat-abi=softfp \
- -mfpu=vfpv3-d16 \
-fno-tree-sra \
-fuse-ld=gold \
-Wno-psabi \
- -mthumb-interwork \
-ffunction-sections \
-funwind-tables \
-g \
@@ -64,11 +58,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-Os \
@@ -125,7 +116,10 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index 31db2e4..ab880d0 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -58,11 +58,8 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo \
-Wno-address \
-Wno-format-security \
- -Wno-non-virtual-dtor \
-Wno-return-type \
-Wno-sequence-point \
-fno-stack-protector \
@@ -119,7 +116,10 @@
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
-Wno-deprecated \
- -Wno-error=c++0x-compat
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
### Rules for final target.
