diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-01-09 17:39:08 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-01-09 17:39:08 +0000 |
| commit | ec5a0335e49e1524ed8fddb699a55dc6c9ce9250 (patch) | |
| tree | 5bd17f38c8cbc663f0d1a3c2a9da44d153e30b0e | |
| parent | 66be170aabfedb497ecadc78e9a208ae68f01461 (diff) | |
| download | freetype-ec5a0335e49e1524ed8fddb699a55dc6c9ce9250.tar.gz | |
Update makefiles after merge of Chromium at 243919
This commit was generated by merge_from_chromium.py.
Change-Id: I4f3e560ed9d79e0ec8de1cd083acd448d5fd293b
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 6 |
6 files changed, 14 insertions, 6 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 1207044..1ca68c5 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -fno-tree-sra \ -fuse-ld=gold \ @@ -147,6 +148,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -fno-tree-sra \ -fuse-ld=gold \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 717adae..3d25dc4 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -56,6 +56,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -EL \ -mhard-float \ @@ -148,6 +149,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -EL \ -mhard-float \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index f6b417c..36b186f 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -54,6 +54,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -m32 \ -mmmx \ @@ -147,6 +148,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -m32 \ -mmmx \ @@ -173,9 +175,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -fno-unwind-tables \ - -fno-asynchronous-unwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 1207044..1ca68c5 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -fno-tree-sra \ -fuse-ld=gold \ @@ -147,6 +148,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -fno-tree-sra \ -fuse-ld=gold \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 717adae..3d25dc4 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -56,6 +56,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -EL \ -mhard-float \ @@ -148,6 +149,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -EL \ -mhard-float \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index f6b417c..36b186f 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -54,6 +54,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -m32 \ -mmmx \ @@ -147,6 +148,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -funwind-tables \ -Wno-format \ -m32 \ -mmmx \ @@ -173,9 +175,7 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ - -fno-unwind-tables \ - -fno-asynchronous-unwind-tables + -fomit-frame-pointer MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ |