diff options
| author | Adam Langley <agl@google.com> | 2016-01-04 18:13:00 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-01-05 19:05:50 +0300 |
| commit | 7b8b9c17db93ea5287575b437c77fb36eeb81b31 (patch) | |
| tree | 9b021b41d8b444fc9b74025542486a4c8eb9fb9f /crypto | |
| parent | 3202750a98fbfa3b72ca1bc02f59ac1f36948589 (diff) | |
Include 'asm' in the name of X25519 asm sources.
Some build systems don't like two targets with the same base name and
the curve25519 code had x25519-x86_64.[Sc].
Change-Id: If8382eb84996d7e75b34b28def57829d93019cff
Reviewed-on: https://boringssl-review.googlesource.com/6878
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/curve25519/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | crypto/curve25519/asm/x25519-asm-arm.S (renamed from crypto/curve25519/asm/x25519-arm.S) | 0 | ||||
| -rw-r--r-- | crypto/curve25519/asm/x25519-asm-x86_64.S (renamed from crypto/curve25519/asm/x25519-x86_64.S) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/crypto/curve25519/CMakeLists.txt b/crypto/curve25519/CMakeLists.txt index 1614ba17..a2ef3bb2 100644 --- a/crypto/curve25519/CMakeLists.txt +++ b/crypto/curve25519/CMakeLists.txt @@ -4,7 +4,7 @@ if (${ARCH} STREQUAL "arm") set( CURVE25519_ARCH_SOURCES - asm/x25519-arm.S + asm/x25519-asm-arm.S ) endif() @@ -12,7 +12,7 @@ if (${ARCH} STREQUAL "x86_64") set( CURVE25519_ARCH_SOURCES - asm/x25519-x86_64.S + asm/x25519-asm-x86_64.S ) endif() diff --git a/crypto/curve25519/asm/x25519-arm.S b/crypto/curve25519/asm/x25519-asm-arm.S index 60d08dd5..60d08dd5 100644 --- a/crypto/curve25519/asm/x25519-arm.S +++ b/crypto/curve25519/asm/x25519-asm-arm.S diff --git a/crypto/curve25519/asm/x25519-x86_64.S b/crypto/curve25519/asm/x25519-asm-x86_64.S index 7e86a231..7e86a231 100644 --- a/crypto/curve25519/asm/x25519-x86_64.S +++ b/crypto/curve25519/asm/x25519-asm-x86_64.S |