summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-07-24 15:02:32 +0200
committerAndy Polyakov <appro@openssl.org>2018-07-25 15:47:12 +0200
commitf529b5cf05139c20f298f553446122123c012317 (patch)
tree756f77bac27486ee717702fc97d0495c5f349127
parent7b953da40d0dee56f360902f872dc8989f6a3e1f (diff)
downloadopenssl-new-f529b5cf05139c20f298f553446122123c012317.tar.gz
INSTALL,NOTES.WIN: classify no-asm as non-production option.
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6773)
-rw-r--r--INSTALL6
-rw-r--r--NOTES.WIN9
2 files changed, 9 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 51141ef655..98c34d6a71 100644
--- a/INSTALL
+++ b/INSTALL
@@ -256,8 +256,10 @@
no-shared option.
no-asm
- Do not use assembler code. On some platforms a small amount
- of assembler code may still be used.
+ Do not use assembler code. This should be viewed as
+ debugging/trouble-shooting option rather than production.
+ On some platforms a small amount of assembler code may
+ still be used even with this option.
no-async
Do not build support for async operations.
diff --git a/NOTES.WIN b/NOTES.WIN
index 014036c712..4d39d06f32 100644
--- a/NOTES.WIN
+++ b/NOTES.WIN
@@ -47,10 +47,11 @@
the other hand oldest one is known not to work. Everything between
falls into best-effort category.
- - Netwide Assembler, a.k.a. NASM, available from http://www.nasm.us,
- is required if you intend to utilize assembler modules. Note that NASM
- is the only supported assembler. The Microsoft provided assembler is NOT
- supported.
+ - Netwide Assembler, a.k.a. NASM, available from https://www.nasm.us,
+ is required. Note that NASM is the only supported assembler. Even
+ though Microsoft provided assembler is NOT supported, contemporary
+ 64-bit version is exercised through continuous integration of
+ VC-WIN64A-masm target.
Installation directories