git commit asm_obsolete Makefile

deps/openssl/asm_obsolete/Makefile

@@ -206,7 +206,7 @@ x86-macosx-gas/%.s:
 x86-win32-masm/%.asm:
 	$(PERL) $< win32 $(SSE2) > $@
 
-.PHONY:	all
+.PHONY:	all clean
 
 all: $(OUTPUTS)
 	# strip trailing whitespace and final blank newline

deps/openssl/doc/UPGRADING.md

@@ -1,14 +1,14 @@
 ## How to upgrade openssl library in io.js
 
-This document is intended to describe the procedure to upgrade openssl
-from 1.0.1m to 1.0.2a in io.js.
+This document describes the procedure to upgrade openssl from 1.0.1m
+to 1.0.2a in io.js.
 
 
 ### Build System and Upgrading Overview
-The openssl build system is based on the perl script of Configure.
-For example, running `Configure linux_x86-64` in the openssl
-repository generates `Makefile` and `opensslconf.h` for the target
-architectures of linux_x86_64.
+The openssl build system is based on the `Configure` perl script in
+`deps/openssl/openssl`. For example, running `Configure linux_x86-64`
+in the openssl repository generates `Makefile` and `opensslconf.h` for
+the target architectures of linux_x86_64.
 The `Makefile` contains the list of asm files which are generated by
 perl scripts during build so that we can get the most of use of the
 hardware performance according to the type of cpus.
@@ -54,10 +54,10 @@ The tested platform in CI are also listed.
 - (*1) use linux-elf as a fallback configuration
 - (*2) no-asm used
 - (*3) currently masm (Microsoft Macro Assembler) is used but it's no
-longer supported in opnessl. We need to move to use nasm or yasm.
+longer supported in openssl. We need to move to use nasm or yasm.
 
 All parameters such as sources, defines, cflags and others generated
-in openssl Makefile are wrote down into `deps/openssl/openssl.gypi`.
+in openssl Makefile are written down into `deps/openssl/openssl.gypi`.
 
 The header file of `deps/openssl/openssl/crypto/opensslconf.h` are
 generated by `Configure` and varies on each os and arch so that we