diff options
| author | Bo Liu <boliu@google.com> | 2014-07-15 14:10:27 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-07-15 14:10:27 -0700 |
| commit | 80f9f658d37b260f6c96248ddd406fcaf228be11 (patch) | |
| tree | 745188ba60a27b8812a4c6e383e80ad3f919ed21 | |
| parent | 56aeae9b065578e56222618886ef0e42488397e2 (diff) | |
| parent | 07e055fe6fa3c90c3ba7a106122508599a64c106 (diff) | |
| download | openssl-80f9f658d37b260f6c96248ddd406fcaf228be11.tar.gz | |
Merge from Chromium at DEPS revision 37.0.2062.21
This commit was generated by merge_to_master.py.
Change-Id: I788812192d2dd69f7053fd1c1b61a28504a9f477
| -rw-r--r-- | openssl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.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-arm64.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 2 |
10 files changed, 8 insertions, 12 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 83ff2d8..2b64e02 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -625,9 +625,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/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk index 40e0e03..a36b4d2 100644 --- a/openssl.target.darwin-arm64.mk +++ b/openssl.target.darwin-arm64.mk @@ -606,7 +606,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -709,7 +708,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index c6c51fa..f3cb1fe 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -614,9 +614,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/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index ec1bdb7..f5b6e0d 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -620,9 +620,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/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk index 95d3124..1fd3eae 100644 --- a/openssl.target.darwin-x86_64.mk +++ b/openssl.target.darwin-x86_64.mk @@ -622,9 +622,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/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 83ff2d8..2b64e02 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -625,9 +625,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/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk index 40e0e03..a36b4d2 100644 --- a/openssl.target.linux-arm64.mk +++ b/openssl.target.linux-arm64.mk @@ -606,7 +606,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -709,7 +708,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index c6c51fa..f3cb1fe 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -614,9 +614,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/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index ec1bdb7..f5b6e0d 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -620,9 +620,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/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 95d3124..1fd3eae 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -622,9 +622,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ |