diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:04 +0100 |
| commit | 297a27a6d908078d50ee0d616c46057c52d23d01 (patch) | |
| tree | 39f19b9006c989047e5855707df0b6d1b0e86d54 | |
| parent | 0be9891fdf4d82df9bb602e845387e37ed8492c4 (diff) | |
| parent | 4721c54bb4e782d0316801e3d80fcba1b865ba3c (diff) | |
| download | freetype-297a27a6d908078d50ee0d616c46057c52d23d01.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: Ia45aa9a671b471267a5e8ca43232e23b9c6dbc16
| -rw-r--r-- | ft2.target.darwin-arm.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-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index f70b0d6..4e8aad0 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -58,7 +58,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -153,7 +152,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 14cb473..b60a57c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -60,7 +60,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -155,7 +154,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 5bb870b..64ebca0 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -60,7 +60,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -155,7 +154,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index f70b0d6..4e8aad0 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -58,7 +58,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -153,7 +152,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 14cb473..b60a57c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -60,7 +60,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -155,7 +154,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index 5bb870b..64ebca0 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -60,7 +60,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -155,7 +154,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ |