Merge from Chromium at DEPS revision 37.0.2062.21
This commit was generated by merge_to_master.py.
Change-Id: Iee203e96f1d63d249e888ad91c547e9084a74313
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 2d08b34..4821eda 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -93,9 +93,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index e40c8f9..96c6ebc 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -83,7 +83,6 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -175,7 +174,6 @@
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index bd4c2c8..0362d21 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -87,9 +87,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index f445a2a..0879bd2 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -88,9 +88,9 @@
-fno-stack-protector \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 62bb57a..4c7e906 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -87,9 +87,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 2d08b34..4821eda 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -93,9 +93,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index e40c8f9..96c6ebc 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -83,7 +83,6 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -175,7 +174,6 @@
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index bd4c2c8..0362d21 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -87,9 +87,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index f445a2a..0879bd2 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -88,9 +88,9 @@
-fno-stack-protector \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 62bb57a..4c7e906 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -87,9 +87,9 @@
-Wno-unused-but-set-variable \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
