diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-06 03:09:58 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-06 03:09:58 +0000 |
| commit | 303c775e4874d83ec04b78bb60e33b0d55635ef1 (patch) | |
| tree | 871c17a0e3caa8aacf710175e60b5c0f41bc3664 | |
| parent | f0723355079c051efa3f32f9a2982acf807b0894 (diff) | |
| download | openssl-303c775e4874d83ec04b78bb60e33b0d55635ef1.tar.gz | |
Update makefiles after merge of Chromium at 268379
This commit was generated by merge_from_chromium.py.
Change-Id: I962c3288e20c90b3e753c79e069597b44e8bca4b
| -rw-r--r-- | openssl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index a1aa51d..b44c4a8 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -599,7 +599,6 @@ MY_CFLAGS_Debug := \ -w \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -703,7 +702,6 @@ MY_CFLAGS_Release := \ -w \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index f97f1fc..93bc202 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -601,7 +601,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -711,7 +710,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk index 8428dbd..07bd9e3 100644 --- a/openssl.target.darwin-x86_64.mk +++ b/openssl.target.darwin-x86_64.mk @@ -604,7 +604,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -714,7 +713,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index a1aa51d..b44c4a8 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -599,7 +599,6 @@ MY_CFLAGS_Debug := \ -w \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -703,7 +702,6 @@ MY_CFLAGS_Release := \ -w \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index f97f1fc..93bc202 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -601,7 +601,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -711,7 +710,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 8428dbd..07bd9e3 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -604,7 +604,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -714,7 +713,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ |