Use C source for openssl RC4 calculation instead of ASM

openssl.gyp

Index: openssl.gyp
diff --git a/openssl.gyp b/openssl.gyp
index 80733269d8bd30fb1aed695efa697d3a9e3aba8d..5760bc2c437073ffd45bf3f94336958bba1e045a 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -65,6 +65,13 @@
         ['target_arch == "x64"', {
           'sources': [ '<@(openssl_x86_64_sources)' ],
           'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
+          # Due to a goma problem with compiling rc4-x86_64.S,
+          # We use the C rc4 source instead of the ASM source.
+          # This hurts performance, but it's not a problem
+          # because no production code uses openssl on x86-64.
+          'sources+': [ 'openssl/crypto/rc4/rc4-enc.S' ],

[digit1, 2013/10/10 07:55:03]

This doesn't build, I think you meant 'rc4-enc.c' here, not 'rc4-enc.S' :-)

[digit1, 2013/10/10 07:56:03]

Actually, it should be "rc4_enc.c"

[digit1, 2013/10/10 08:02:52]

While we're at it, Intel is contributing many patches to port Android to x86_64
at the moment, can I ask you to put this change in a 'conditions' block like 'os
!= "android"' to ensure the assembly version would still be used here?

(I'm assuming that, given that the toolchain will be different, Goma may not
have issues compiling this later).

[yhirano, 2013/10/10 11:49:39]

Thanks, done.

+          'sources!': [ 'openssl/crypto/rc4/asm/rc4-x86_64.S' ],
+
           'defines': [ '<@(openssl_x86_64_defines)' ],
           'defines!': [ 'OPENSSL_NO_ASM' ],
           'variables': {