diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:08 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:08 +0100 |
| commit | eb03671fa81ae763668e5037c1f2f7d8b5e5d6e7 (patch) | |
| tree | c46c8ac321a98e870f90aa7ecb7b2b12875ab8b5 | |
| parent | 835dce8f4766cf16b840e4abe40a479620985033 (diff) | |
| parent | 55c805d52ba79195efa9d89d4d9a39b4c1b99f59 (diff) | |
| download | libsrtp-eb03671fa81ae763668e5037c1f2f7d8b5e5d6e7.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: Ic3fdd3e1f60ec423bef3aafb179d32ca4219c68b
| -rw-r--r-- | libsrtp.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86_64.mk | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 3ab8dbd..df4f7a3 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -62,7 +62,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,7 +164,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index 4206f39..8785fdb 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -64,7 +64,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -167,7 +166,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk index 80958fe..262bf7a 100644 --- a/libsrtp.target.darwin-x86_64.mk +++ b/libsrtp.target.darwin-x86_64.mk @@ -64,7 +64,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -167,7 +166,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 3ab8dbd..df4f7a3 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -62,7 +62,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,7 +164,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index 4206f39..8785fdb 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -64,7 +64,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -167,7 +166,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk index 80958fe..262bf7a 100644 --- a/libsrtp.target.linux-x86_64.mk +++ b/libsrtp.target.linux-x86_64.mk @@ -64,7 +64,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -167,7 +166,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ |