Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: openssl.gyp

Issue 153373003: Fix of crash in e_rc4_hmac_md5.c caused by rc4-md5-x86_64.S. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Fix RC4_INT in opensslconf.h Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « import_from_android.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'openssl', 8 'target_name': 'openssl',
9 'type': '<(component)', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 }], 58 }],
59 ['target_arch == "ia32"', { 59 ['target_arch == "ia32"', {
60 'sources': [ '<@(openssl_x86_sources)' ], 60 'sources': [ '<@(openssl_x86_sources)' ],
61 'sources!': [ '<@(openssl_x86_source_excludes)' ], 61 'sources!': [ '<@(openssl_x86_source_excludes)' ],
62 'defines': [ '<@(openssl_x86_defines)' ], 62 'defines': [ '<@(openssl_x86_defines)' ],
63 'defines!': [ 'OPENSSL_NO_ASM' ], 63 'defines!': [ 'OPENSSL_NO_ASM' ],
64 }], 64 }],
65 ['target_arch == "x64"', { 65 ['target_arch == "x64"', {
66 'sources': [ '<@(openssl_x86_64_sources)' ], 66 'sources': [ '<@(openssl_x86_64_sources)' ],
67 'sources!': [ '<@(openssl_x86_64_source_excludes)' ], 67 'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
68 'conditions': [
69 ['OS != "android"', {
70 # Because rc4-x86_64.S has a problem,
71 # We use the C rc4 source instead of the ASM source.
72 # This hurts performance, but it's not a problem
73 # because no production code uses openssl on x86-64.
74 'sources/': [
75 ['exclude', 'openssl/crypto/rc4/asm/rc4-x86_64\\.S' ],
76 ['include', 'openssl/crypto/rc4/rc4_enc\\.c' ],
77 ['include', 'openssl/crypto/rc4/rc4_skey\\.c' ],
78 ],
79 }]
80 ],
81 'defines': [ '<@(openssl_x86_64_defines)' ], 68 'defines': [ '<@(openssl_x86_64_defines)' ],
82 'defines!': [ 'OPENSSL_NO_ASM' ], 69 'defines!': [ 'OPENSSL_NO_ASM' ],
83 'variables': { 70 'variables': {
84 # Ensure the 64-bit opensslconf.h header is used. 71 # Ensure the 64-bit opensslconf.h header is used.
85 'openssl_include_dirs+': [ 'config/x64' ], 72 'openssl_include_dirs+': [ 'config/x64' ],
86 }, 73 },
87 }], 74 }],
88 ['component == "shared_library"', { 75 ['component == "shared_library"', {
89 'cflags!': ['-fvisibility=hidden'], 76 'cflags!': ['-fvisibility=hidden'],
90 }], 77 }],
(...skipping 21 matching lines...) Expand all
112 }, 99 },
113 }, 100 },
114 ], 101 ],
115 } 102 }
116 103
117 # Local Variables: 104 # Local Variables:
118 # tab-width:2 105 # tab-width:2
119 # indent-tabs-mode:nil 106 # indent-tabs-mode:nil
120 # End: 107 # End:
121 # vim: set expandtab tabstop=2 shiftwidth=2: 108 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « import_from_android.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698