diff options
| author | David Benjamin <davidben@chromium.org> | 2014-10-30 00:13:38 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-10-30 02:13:20 +0300 |
| commit | 3e700bb3e812730f60bec529a14c0d35ea9665aa (patch) | |
| tree | 6bcab6fc57502e75c316d855c018d256d4c6def4 /crypto/CMakeLists.txt | |
| parent | 2a0f3420f72b47b31c259ffd9f1dde8e646cc0e6 (diff) | |
Get MASM output working on Win32.
We were building the NASM flavor with MASM which is why it didn't work. Get the
MASM output working: cpuid and cmove are not available in MASM unless the file
declares .686. Also work around MASM rejecting a very long line in SHA-256.
The follow-up change will get the NASM flavor working. We should probably use
that one as it's documented as supported upstream. But let's make this one
functional too.
Change-Id: Ica69cc042a7250c7bc9ba9325caab597cd4ce616
Reviewed-on: https://boringssl-review.googlesource.com/2091
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/CMakeLists.txt')
| -rw-r--r-- | crypto/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 5d656ecc..117614e9 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -13,8 +13,8 @@ else() message("Using masm") set(PERLASM_STYLE masm) else() - message("Using win32n") - set(PERLASM_STYLE win32n) + message("Using win32") + set(PERLASM_STYLE win32) endif() set(ASM_EXT asm) enable_language(ASM_MASM) @@ -27,9 +27,10 @@ function(perlasm dest src) DEPENDS ${src} ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86_64-xlate.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl + ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl + ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86masm.pl + ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86nasm.pl WORKING_DIRECTORY . ) endfunction() |