Update makefiles after merge of Chromium at e5f75e0d602b
This commit was generated by merge_from_chromium.py.
Change-Id: I277c43d571abaa40bab7afe9c8fdf0899aeb623c
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
index 819bdc4..e58a6eb 100644
--- a/icudata.host.linux-x86_64.mk
+++ b/icudata.host.linux-x86_64.mk
@@ -39,9 +39,15 @@
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-Wno-format \
-m64 \
+ -Wheader-hygiene \
+ -Wno-char-subscripts \
+ -Wno-unneeded-internal-declaration \
+ -Wno-covered-switch-default \
+ -Wstring-conversion \
+ -Wno-c++11-narrowing \
+ -Wno-deprecated-register \
-Os \
-g \
-fdata-sections \
@@ -95,7 +101,8 @@
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
- -Wno-deprecated
+ -Wno-deprecated \
+ -std=gnu++11
# Flags passed to both C and C++ files.
@@ -110,9 +117,15 @@
-fvisibility=hidden \
-pipe \
-fPIC \
- -Wno-unused-local-typedefs \
-Wno-format \
-m64 \
+ -Wheader-hygiene \
+ -Wno-char-subscripts \
+ -Wno-unneeded-internal-declaration \
+ -Wno-covered-switch-default \
+ -Wstring-conversion \
+ -Wno-c++11-narrowing \
+ -Wno-deprecated-register \
-Os \
-fno-ident \
-fdata-sections \
@@ -166,7 +179,8 @@
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
- -Wno-deprecated
+ -Wno-deprecated \
+ -std=gnu++11
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))