Commit 7d8f36e9 authored by Martin Thomson's avatar Martin Thomson

Backed out changeset 77ae602f995a for gecko build failures.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1471566#c4
parent 9731f879
......@@ -6,30 +6,6 @@
'../../coreconf/config.gypi'
],
'targets': [
{
'target_name': 'intel-gcm-s_lib',
'type': 'static_library',
'sources': [
'intel-aes.s',
'intel-gcm.s',
],
'dependencies': [
'<(DEPTH)/exports.gyp:nss_exports'
],
'conditions': [
[ 'cc_is_clang==1', {
'cflags': [
'-no-integrated-as',
],
}],
],
'cflags_mozilla': [
'-no-integrated-as',
],
'asflags_mozilla': [
'-no-integrated-as',
],
},
{
'target_name': 'intel-gcm-wrap_c_lib',
'type': 'static_library',
......@@ -39,19 +15,12 @@
'dependencies': [
'<(DEPTH)/exports.gyp:nss_exports'
],
'conditions': [
[ 'OS=="linux" and target_arch=="x64"', {
'dependencies': [
'intel-gcm-s_lib',
],
}],
],
'cflags': [
'-mssse3',
'-mssse3'
],
'cflags_mozilla': [
'-mssse3'
],
]
},
{
# TODO: make this so that all hardware accelerated code is in here.
......
......@@ -67,12 +67,14 @@
[ 'target_arch=="x64"', {
'sources': [
'arcfour-amd64-gas.s',
'intel-aes.s',
'intel-gcm.s',
'mpi/mpi_amd64.c',
'mpi/mpi_amd64_gas.s',
'mpi/mp_comba.c',
],
'conditions': [
[ 'cc_is_clang==1 and fuzz!=1', {
[ 'cc_is_clang==1', {
'cflags': [
'-no-integrated-as',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment