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

Side by Side Diff: nss.gyp

Issue 258013011: Disable Intel AES assembly code on Windows because of memory corruption (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="ios"', { 8 ['OS=="ios"', {
9 'exclude_nss_root_certs%': 0, 9 'exclude_nss_root_certs%': 0,
10 'exclude_nss_libpkix%': 0, 10 'exclude_nss_libpkix%': 0,
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 ['target_arch=="ia32"', { 1164 ['target_arch=="ia32"', {
1165 'defines': [ 1165 'defines': [
1166 'NSS_X86_OR_X64', 1166 'NSS_X86_OR_X64',
1167 'NSS_X86', 1167 'NSS_X86',
1168 '_X86_', 1168 '_X86_',
1169 'MP_ASSEMBLY_MULTIPLY', 1169 'MP_ASSEMBLY_MULTIPLY',
1170 'MP_ASSEMBLY_SQUARE', 1170 'MP_ASSEMBLY_SQUARE',
1171 'MP_ASSEMBLY_DIV_2DX1D', 1171 'MP_ASSEMBLY_DIV_2DX1D',
1172 'MP_USE_UINT_DIGIT', 1172 'MP_USE_UINT_DIGIT',
1173 'MP_NO_MP_WORD', 1173 'MP_NO_MP_WORD',
1174 'USE_HW_AES', 1174 ],
1175 # intel-gcm-x86-masm.asm seems to corrupt memory, so disable all
1176 # Intel AES assembly code. (http://crbug.com/367515)
1177 'sources!': [
1178 'nss/lib/freebl/intel-aes-x86-masm.asm',
1179 'nss/lib/freebl/intel-gcm-wrap.c',
1180 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1175 ], 1181 ],
1176 'msvs_settings': { 1182 'msvs_settings': {
1177 'MASM': { 1183 'MASM': {
1178 'UseSafeExceptionHandlers': 'true', 1184 'UseSafeExceptionHandlers': 'true',
1179 }, 1185 },
1180 }, 1186 },
1181 }], 1187 }],
1182 ['target_arch=="x64"', { 1188 ['target_arch=="x64"', {
1183 'defines': [ 1189 'defines': [
1184 'NSS_USE_64', 1190 'NSS_USE_64',
1185 'NSS_X86_OR_X64', 1191 'NSS_X86_OR_X64',
1186 'NSS_X64', 1192 'NSS_X64',
1187 '_AMD64_', 1193 '_AMD64_',
1188 'MP_CHAR_STORE_SLOW', 1194 'MP_CHAR_STORE_SLOW',
1189 'MP_IS_LITTLE_ENDIAN', 1195 'MP_IS_LITTLE_ENDIAN',
1190 'WIN64', 1196 'WIN64',
1191 ], 1197 ],
1192 'sources!': [ 1198 'sources!': [
1193 'nss/lib/freebl/intel-aes-x64-masm.asm', 1199 'nss/lib/freebl/intel-aes-x64-masm.asm',
1194 'nss/lib/freebl/intel-aes-x86-masm.asm', 1200 'nss/lib/freebl/intel-aes-x86-masm.asm',
1195 'nss/lib/freebl/intel-gcm-wrap.c', 1201 'nss/lib/freebl/intel-gcm-wrap.c',
1196 'nss/lib/freebl/intel-gcm-x64-masm.asm', 1202 'nss/lib/freebl/intel-gcm-x64-masm.asm',
1197 'nss/lib/freebl/intel-aes-x86-masm.asm', 1203 'nss/lib/freebl/intel-gcm-x86-masm.asm',
1198 'nss/lib/freebl/mpi/mpi_amd64.c', 1204 'nss/lib/freebl/mpi/mpi_amd64.c',
1199 'nss/lib/freebl/mpi/mpi_x86_asm.c', 1205 'nss/lib/freebl/mpi/mpi_x86_asm.c',
1200 ], 1206 ],
1201 }], 1207 }],
1202 ], 1208 ],
1203 }, { # else: OS!="win" 1209 }, { # else: OS!="win"
1204 'sources!': [ 1210 'sources!': [
1205 'nss/lib/freebl/intel-aes-x64-masm.asm', 1211 'nss/lib/freebl/intel-aes-x64-masm.asm',
1206 'nss/lib/freebl/intel-aes-x86-masm.asm', 1212 'nss/lib/freebl/intel-aes-x86-masm.asm',
1207 'nss/lib/freebl/intel-gcm-wrap.c', 1213 'nss/lib/freebl/intel-gcm-wrap.c',
(...skipping 23 matching lines...) Expand all
1231 '-Wno-incompatible-pointer-types', 1237 '-Wno-incompatible-pointer-types',
1232 '-Wno-logical-op-parentheses', 1238 '-Wno-logical-op-parentheses',
1233 '-Wno-switch', 1239 '-Wno-switch',
1234 '-Wno-tautological-compare', 1240 '-Wno-tautological-compare',
1235 ], 1241 ],
1236 }], 1242 }],
1237 ], 1243 ],
1238 }, 1244 },
1239 ], 1245 ],
1240 } 1246 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698