diff options
| author | Bo Liu <boliu@google.com> | 2014-07-15 14:10:14 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-07-15 14:10:14 -0700 |
| commit | bfe0f08e261e819f74078db9a6cd3c0cc3708613 (patch) | |
| tree | 4d7df8b81c2f2139e24c4bb0fb06ac5e667693b9 | |
| parent | 1eb40f49ce49868d8f1eff74e35b9598a20ce8c5 (diff) | |
| parent | 6e898104464eb3ce1322b5135f21287f90ba66d0 (diff) | |
| download | freetype-bfe0f08e261e819f74078db9a6cd3c0cc3708613.tar.gz | |
Merge from Chromium at DEPS revision 37.0.2062.21
This commit was generated by merge_to_master.py.
Change-Id: I11fd729892d9d5ce3f93e7e328b6aaebd7b5f0e0
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 2 |
10 files changed, 8 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 9bf69d9..3efcefe 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -84,9 +84,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index c43d64b..24f7ecc 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 6850b25..7620e24 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index ccd4668..4fb53d5 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index da630b9..4e215a7 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -78,9 +78,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 9bf69d9..3efcefe 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -84,9 +84,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index c43d64b..24f7ecc 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 6850b25..7620e24 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index ccd4668..4fb53d5 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index da630b9..4e215a7 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -78,9 +78,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ |