diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-01-17 04:23:28 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-01-17 04:23:28 +0000 |
| commit | 357c87a5302c5d7c02c10870ebe7a78652807497 (patch) | |
| tree | d14d7cf9576cf72ecbf628c86fea7a7a3c2b437e | |
| parent | 89f8b2711b317ccf82f770d76eb56eee57ad9e7a (diff) | |
| download | freetype-357c87a5302c5d7c02c10870ebe7a78652807497.tar.gz | |
Update makefiles after merge of Chromium at 245421
This commit was generated by merge_from_chromium.py.
Change-Id: I85657df8f86a043a80a83a37d6f2f40235ae0b62
| -rw-r--r-- | ft2.target.darwin-arm.mk | 6 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 6 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 6 |
6 files changed, 14 insertions, 22 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 6c77251..3d38ca8 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -78,8 +78,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -170,8 +169,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index fda680a..8aa5168 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -78,8 +78,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -170,8 +169,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 073c551..01244e5 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -80,8 +80,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -174,7 +173,8 @@ MY_CFLAGS_Release := \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ - -funwind-tables + -fno-unwind-tables \ + -fno-asynchronous-unwind-tables MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 6c77251..3d38ca8 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -78,8 +78,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -170,8 +169,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index fda680a..8aa5168 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -78,8 +78,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -170,8 +169,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -funwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 073c551..01244e5 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -80,8 +80,7 @@ MY_CFLAGS_Debug := \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections \ - -funwind-tables + -ffunction-sections MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ @@ -174,7 +173,8 @@ MY_CFLAGS_Release := \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ - -funwind-tables + -fno-unwind-tables \ + -fno-asynchronous-unwind-tables MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ |