diff options
author | David 'Digit' Turner <digit@google.com> | 2012-10-05 16:31:08 +0200 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2012-10-05 15:54:14 -0700 |
commit | 9838b9f4b038825b061a6b323842f9d23729eac0 (patch) | |
tree | ab4bf9240b9b8aa7c34c0b06d930f981332b7ae3 /crypto | |
parent | b73232f04f56fed92f24a07604e8b0cc2d686245 (diff) | |
download | replicant_openssl-9838b9f4b038825b061a6b323842f9d23729eac0.zip replicant_openssl-9838b9f4b038825b061a6b323842f9d23729eac0.tar.gz replicant_openssl-9838b9f4b038825b061a6b323842f9d23729eac0.tar.bz2 |
Rename assembly files with .S extensions.
The openssl files were generated with an .s extension,
which tells GCC that they normally don't need to be sent
to the pre-processor (i.e. they are passed directly to the
assembler).
Unfortunately, all these files _do_ need to be preprocessed,
which is why 'LOCAL_AS_CFLAGS := -x assembler-with-cpp' was
required in Crypto.mk.
As simpler way to solve the issue is simply to use an .S
extension when generating the assembly files. GCC knows
that these must be pre-processed first.
So the patch does:
- Rename all .s files to .S
- Remove the use of -x assembler-with-cpp from Crypto.mk
- Modify import_openssl.sh to directly generate .S files
(tested)
Context: This makes it easier to reuse the exact same sources
for Chrome on Android. Its gyp build system doesn't
have a feature comparable to LOCAL_AS_CFLAGS.
Change-Id: I708d9fbcf8d42b5c39a7d30df2b03ed79a3e62f0
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/aes/asm/aes-586.S (renamed from crypto/aes/asm/aes-586.s) | 0 | ||||
-rw-r--r-- | crypto/aes/asm/aes-armv4.S (renamed from crypto/aes/asm/aes-armv4.s) | 0 | ||||
-rw-r--r-- | crypto/aes/asm/aes-mips.S (renamed from crypto/aes/asm/aes-mips.s) | 0 | ||||
-rw-r--r-- | crypto/aes/asm/aesni-x86.S (renamed from crypto/aes/asm/aesni-x86.s) | 0 | ||||
-rw-r--r-- | crypto/aes/asm/vpaes-x86.S (renamed from crypto/aes/asm/vpaes-x86.s) | 0 | ||||
-rw-r--r-- | crypto/bf/asm/bf-586.S (renamed from crypto/bf/asm/bf-586.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/armv4-gf2m.S (renamed from crypto/bn/asm/armv4-gf2m.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/armv4-mont.S (renamed from crypto/bn/asm/armv4-mont.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/bn-586.S (renamed from crypto/bn/asm/bn-586.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/bn-mips.S (renamed from crypto/bn/asm/bn-mips.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/co-586.S (renamed from crypto/bn/asm/co-586.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/mips-mont.S (renamed from crypto/bn/asm/mips-mont.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/x86-gf2m.S (renamed from crypto/bn/asm/x86-gf2m.s) | 0 | ||||
-rw-r--r-- | crypto/bn/asm/x86-mont.S (renamed from crypto/bn/asm/x86-mont.s) | 0 | ||||
-rw-r--r-- | crypto/des/asm/crypt586.S (renamed from crypto/des/asm/crypt586.s) | 0 | ||||
-rw-r--r-- | crypto/des/asm/des-586.S (renamed from crypto/des/asm/des-586.s) | 0 | ||||
-rw-r--r-- | crypto/md5/asm/md5-586.S (renamed from crypto/md5/asm/md5-586.s) | 0 | ||||
-rw-r--r-- | crypto/modes/asm/ghash-armv4.S (renamed from crypto/modes/asm/ghash-armv4.s) | 0 | ||||
-rw-r--r-- | crypto/modes/asm/ghash-x86.S (renamed from crypto/modes/asm/ghash-x86.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha1-586.S (renamed from crypto/sha/asm/sha1-586.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha1-armv4-large.S (renamed from crypto/sha/asm/sha1-armv4-large.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha1-mips.S (renamed from crypto/sha/asm/sha1-mips.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha256-586.S (renamed from crypto/sha/asm/sha256-586.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha256-armv4.S (renamed from crypto/sha/asm/sha256-armv4.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha256-mips.S (renamed from crypto/sha/asm/sha256-mips.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha512-586.S (renamed from crypto/sha/asm/sha512-586.s) | 0 | ||||
-rw-r--r-- | crypto/sha/asm/sha512-armv4.S (renamed from crypto/sha/asm/sha512-armv4.s) | 0 |
27 files changed, 0 insertions, 0 deletions
diff --git a/crypto/aes/asm/aes-586.s b/crypto/aes/asm/aes-586.S index f69b7d5..f69b7d5 100644 --- a/crypto/aes/asm/aes-586.s +++ b/crypto/aes/asm/aes-586.S diff --git a/crypto/aes/asm/aes-armv4.s b/crypto/aes/asm/aes-armv4.S index 2697d4c..2697d4c 100644 --- a/crypto/aes/asm/aes-armv4.s +++ b/crypto/aes/asm/aes-armv4.S diff --git a/crypto/aes/asm/aes-mips.s b/crypto/aes/asm/aes-mips.S index f5750bf..f5750bf 100644 --- a/crypto/aes/asm/aes-mips.s +++ b/crypto/aes/asm/aes-mips.S diff --git a/crypto/aes/asm/aesni-x86.s b/crypto/aes/asm/aesni-x86.S index 0766bb5..0766bb5 100644 --- a/crypto/aes/asm/aesni-x86.s +++ b/crypto/aes/asm/aesni-x86.S diff --git a/crypto/aes/asm/vpaes-x86.s b/crypto/aes/asm/vpaes-x86.S index c53a507..c53a507 100644 --- a/crypto/aes/asm/vpaes-x86.s +++ b/crypto/aes/asm/vpaes-x86.S diff --git a/crypto/bf/asm/bf-586.s b/crypto/bf/asm/bf-586.S index aa718d4..aa718d4 100644 --- a/crypto/bf/asm/bf-586.s +++ b/crypto/bf/asm/bf-586.S diff --git a/crypto/bn/asm/armv4-gf2m.s b/crypto/bn/asm/armv4-gf2m.S index 2c209e1..2c209e1 100644 --- a/crypto/bn/asm/armv4-gf2m.s +++ b/crypto/bn/asm/armv4-gf2m.S diff --git a/crypto/bn/asm/armv4-mont.s b/crypto/bn/asm/armv4-mont.S index 64c220b..64c220b 100644 --- a/crypto/bn/asm/armv4-mont.s +++ b/crypto/bn/asm/armv4-mont.S diff --git a/crypto/bn/asm/bn-586.s b/crypto/bn/asm/bn-586.S index fe873ce..fe873ce 100644 --- a/crypto/bn/asm/bn-586.s +++ b/crypto/bn/asm/bn-586.S diff --git a/crypto/bn/asm/bn-mips.s b/crypto/bn/asm/bn-mips.S index 02097fa..02097fa 100644 --- a/crypto/bn/asm/bn-mips.s +++ b/crypto/bn/asm/bn-mips.S diff --git a/crypto/bn/asm/co-586.s b/crypto/bn/asm/co-586.S index 3cb8073..3cb8073 100644 --- a/crypto/bn/asm/co-586.s +++ b/crypto/bn/asm/co-586.S diff --git a/crypto/bn/asm/mips-mont.s b/crypto/bn/asm/mips-mont.S index 32ecee5..32ecee5 100644 --- a/crypto/bn/asm/mips-mont.s +++ b/crypto/bn/asm/mips-mont.S diff --git a/crypto/bn/asm/x86-gf2m.s b/crypto/bn/asm/x86-gf2m.S index f07843b..f07843b 100644 --- a/crypto/bn/asm/x86-gf2m.s +++ b/crypto/bn/asm/x86-gf2m.S diff --git a/crypto/bn/asm/x86-mont.s b/crypto/bn/asm/x86-mont.S index 2bbb0e3..2bbb0e3 100644 --- a/crypto/bn/asm/x86-mont.s +++ b/crypto/bn/asm/x86-mont.S diff --git a/crypto/des/asm/crypt586.s b/crypto/des/asm/crypt586.S index 46c81c4..46c81c4 100644 --- a/crypto/des/asm/crypt586.s +++ b/crypto/des/asm/crypt586.S diff --git a/crypto/des/asm/des-586.s b/crypto/des/asm/des-586.S index 2fbd340..2fbd340 100644 --- a/crypto/des/asm/des-586.s +++ b/crypto/des/asm/des-586.S diff --git a/crypto/md5/asm/md5-586.s b/crypto/md5/asm/md5-586.S index 23e4de7..23e4de7 100644 --- a/crypto/md5/asm/md5-586.s +++ b/crypto/md5/asm/md5-586.S diff --git a/crypto/modes/asm/ghash-armv4.s b/crypto/modes/asm/ghash-armv4.S index 4da2156..4da2156 100644 --- a/crypto/modes/asm/ghash-armv4.s +++ b/crypto/modes/asm/ghash-armv4.S diff --git a/crypto/modes/asm/ghash-x86.s b/crypto/modes/asm/ghash-x86.S index cb9ae20..cb9ae20 100644 --- a/crypto/modes/asm/ghash-x86.s +++ b/crypto/modes/asm/ghash-x86.S diff --git a/crypto/sha/asm/sha1-586.s b/crypto/sha/asm/sha1-586.S index e77f654..e77f654 100644 --- a/crypto/sha/asm/sha1-586.s +++ b/crypto/sha/asm/sha1-586.S diff --git a/crypto/sha/asm/sha1-armv4-large.s b/crypto/sha/asm/sha1-armv4-large.S index 97ad8be..97ad8be 100644 --- a/crypto/sha/asm/sha1-armv4-large.s +++ b/crypto/sha/asm/sha1-armv4-large.S diff --git a/crypto/sha/asm/sha1-mips.s b/crypto/sha/asm/sha1-mips.S index 865da25..865da25 100644 --- a/crypto/sha/asm/sha1-mips.s +++ b/crypto/sha/asm/sha1-mips.S diff --git a/crypto/sha/asm/sha256-586.s b/crypto/sha/asm/sha256-586.S index 77a8951..77a8951 100644 --- a/crypto/sha/asm/sha256-586.s +++ b/crypto/sha/asm/sha256-586.S diff --git a/crypto/sha/asm/sha256-armv4.s b/crypto/sha/asm/sha256-armv4.S index 9c20a63..9c20a63 100644 --- a/crypto/sha/asm/sha256-armv4.s +++ b/crypto/sha/asm/sha256-armv4.S diff --git a/crypto/sha/asm/sha256-mips.s b/crypto/sha/asm/sha256-mips.S index 5fc697f..5fc697f 100644 --- a/crypto/sha/asm/sha256-mips.s +++ b/crypto/sha/asm/sha256-mips.S diff --git a/crypto/sha/asm/sha512-586.s b/crypto/sha/asm/sha512-586.S index 4b806f3..4b806f3 100644 --- a/crypto/sha/asm/sha512-586.s +++ b/crypto/sha/asm/sha512-586.S diff --git a/crypto/sha/asm/sha512-armv4.s b/crypto/sha/asm/sha512-armv4.S index 5730192..5730192 100644 --- a/crypto/sha/asm/sha512-armv4.s +++ b/crypto/sha/asm/sha512-armv4.S |