Skip to content

Commit b59420c

Browse files
author
Shigeki Ohtsu
committed
git commit asm_obsolete Makefile
1 parent 4be6b96 commit b59420c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

deps/openssl/asm_obsolete/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ x86-macosx-gas/%.s:
206206
x86-win32-masm/%.asm:
207207
$(PERL) $< win32 $(SSE2) > $@
208208

209-
.PHONY: all
209+
.PHONY: all clean
210210

211211
all: $(OUTPUTS)
212212
# strip trailing whitespace and final blank newline

deps/openssl/doc/UPGRADING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
## How to upgrade openssl library in io.js
22

3-
This document is intended to describe the procedure to upgrade openssl
4-
from 1.0.1m to 1.0.2a in io.js.
3+
This document describes the procedure to upgrade openssl from 1.0.1m
4+
to 1.0.2a in io.js.
55

66

77
### Build System and Upgrading Overview
8-
The openssl build system is based on the perl script of Configure.
9-
For example, running `Configure linux_x86-64` in the openssl
10-
repository generates `Makefile` and `opensslconf.h` for the target
11-
architectures of linux_x86_64.
8+
The openssl build system is based on the `Configure` perl script in
9+
`deps/openssl/openssl`. For example, running `Configure linux_x86-64`
10+
in the openssl repository generates `Makefile` and `opensslconf.h` for
11+
the target architectures of linux_x86_64.
1212
The `Makefile` contains the list of asm files which are generated by
1313
perl scripts during build so that we can get the most of use of the
1414
hardware performance according to the type of cpus.
@@ -54,10 +54,10 @@ The tested platform in CI are also listed.
5454
- (*1) use linux-elf as a fallback configuration
5555
- (*2) no-asm used
5656
- (*3) currently masm (Microsoft Macro Assembler) is used but it's no
57-
longer supported in opnessl. We need to move to use nasm or yasm.
57+
longer supported in openssl. We need to move to use nasm or yasm.
5858

5959
All parameters such as sources, defines, cflags and others generated
60-
in openssl Makefile are wrote down into `deps/openssl/openssl.gypi`.
60+
in openssl Makefile are written down into `deps/openssl/openssl.gypi`.
6161

6262
The header file of `deps/openssl/openssl/crypto/opensslconf.h` are
6363
generated by `Configure` and varies on each os and arch so that we

0 commit comments

Comments
 (0)