Also remove chacha_vec.c from x86.
We don't build with SSE2 on x86 it seems.
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@235797 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/openssl.gypi b/openssl.gypi
index 6280456..856b72e 100644
--- a/openssl.gypi
+++ b/openssl.gypi
@@ -605,7 +605,6 @@
'openssl/crypto/aes/aes_cbc.c',
'openssl/crypto/bf/bf_enc.c',
'openssl/crypto/bn/bn_asm.c',
- 'openssl/crypto/chacha/chacha_enc.c',
'openssl/crypto/des/des_enc.c',
'openssl/crypto/des/fcrypt_b.c',
'openssl/crypto/mem_clr.c',
@@ -619,7 +618,6 @@
'openssl/crypto/bn/asm/co-586.S',
'openssl/crypto/bn/asm/x86-gf2m.S',
'openssl/crypto/bn/asm/x86-mont.S',
- 'openssl/crypto/chacha/chacha_vec.c',
'openssl/crypto/des/asm/crypt586.S',
'openssl/crypto/des/asm/des-586.S',
'openssl/crypto/md5/asm/md5-586.S',
diff --git a/openssl/Crypto-config.mk b/openssl/Crypto-config.mk
index aab86d3..5916183 100644
--- a/openssl/Crypto-config.mk
+++ b/openssl/Crypto-config.mk
@@ -593,7 +593,6 @@
crypto/bn/asm/co-586.S \
crypto/bn/asm/x86-gf2m.S \
crypto/bn/asm/x86-mont.S \
- crypto/chacha/chacha_vec.c \
crypto/des/asm/crypt586.S \
crypto/des/asm/des-586.S \
crypto/md5/asm/md5-586.S \
@@ -608,7 +607,6 @@
crypto/aes/aes_core.c \
crypto/bf/bf_enc.c \
crypto/bn/bn_asm.c \
- crypto/chacha/chacha_enc.c \
crypto/des/des_enc.c \
crypto/des/fcrypt_b.c \
crypto/mem_clr.c \
diff --git a/openssl/openssl.config b/openssl/openssl.config
index 9126e72..3a980f4 100644
--- a/openssl/openssl.config
+++ b/openssl/openssl.config
@@ -828,7 +828,6 @@
crypto/bn/asm/co-586.S \
crypto/bn/asm/x86-gf2m.S \
crypto/bn/asm/x86-mont.S \
-crypto/chacha/chacha_vec.c \
crypto/des/asm/crypt586.S \
crypto/des/asm/des-586.S \
crypto/md5/asm/md5-586.S \
@@ -844,7 +843,6 @@
crypto/aes/aes_cbc.c \
crypto/bf/bf_enc.c \
crypto/bn/bn_asm.c \
-crypto/chacha/chacha_enc.c \
crypto/des/des_enc.c \
crypto/des/fcrypt_b.c \
crypto/mem_clr.c \
diff --git a/patches.chromium/0007-chacha.patch b/patches.chromium/0007-chacha.patch
index b42492f..a881cbc 100644
--- a/patches.chromium/0007-chacha.patch
+++ b/patches.chromium/0007-chacha.patch
@@ -44,29 +44,6 @@
crypto/sha/asm/sha1-armv4-large.S \
crypto/sha/asm/sha256-armv4.S \
crypto/sha/asm/sha512-armv4.S \
-@@ -821,10 +828,11 @@
- crypto/bn/asm/co-586.S \
- crypto/bn/asm/x86-gf2m.S \
- crypto/bn/asm/x86-mont.S \
-+crypto/chacha/chacha_vec.c \
- crypto/des/asm/crypt586.S \
- crypto/des/asm/des-586.S \
- crypto/md5/asm/md5-586.S \
- crypto/modes/asm/ghash-x86.S \
- crypto/sha/asm/sha1-586.S \
- crypto/sha/asm/sha256-586.S \
- crypto/sha/asm/sha512-586.S \
-@@ -836,9 +845,10 @@
- crypto/aes/aes_cbc.c \
- crypto/bf/bf_enc.c \
- crypto/bn/bn_asm.c \
-+crypto/chacha/chacha_enc.c \
- crypto/des/des_enc.c \
- crypto/des/fcrypt_b.c \
- crypto/mem_clr.c \
- "
-
- OPENSSL_CRYPTO_SOURCES_x86_64="\
@@ -852,6 +863,7 @@
crypto/bn/asm/x86_64-gf2m.S \
crypto/bn/asm/x86_64-mont.S \
