Commit 886657a6 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure, etc.: engage additional assembler modules.

parent db896db5

Configure

+95 −47

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.org

+6 −2
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ SHA1_ASM_OBJ= 
RMD160_ASM_OBJ= 

WP_ASM_OBJ=

CMLL_ENC=

MODES_ASM_OBJ=

ENGINES_ASM_OBJ=

PERLASM_SCHEME=



# KRB5 stuff
@@ -228,6 +230,8 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ 
		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\

		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\

		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\

		MODES_ASM_OBJ='$(MODES_ASM_OBJ)'		\

		ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'		\

		PERLASM_SCHEME='$(PERLASM_SCHEME)'		\

		FIPSLIBDIR='${FIPSLIBDIR}'			\

		FIPSDIR='${FIPSDIR}'				\
@@ -395,7 +399,7 @@ Makefile: Makefile.org Configure config 
	@false



libclean:

	rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib

	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib



clean:	libclean

	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
@@ -547,7 +551,7 @@ install_sw: 
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

	done;

	@set -e; target=install; $(RECURSIVE_BUILD_CMD)

	@set -e; for i in $(LIBS) ;\

	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\

	do \

		if [ -f "$$i" ]; then \

		(       echo installing $$i; \

TABLE

+841 −219

File changed.

Preview size limit exceeded, changes collapsed.

ms/do_win64a.bat

+14 −4
Original line number Diff line number Diff line 


perl util\mkfiles.pl >MINFO

perl ms\uplink.pl win64a > ms\uptable.asm



cmd /c "nasm -f win64 -v" >NUL: 2>&1

if %errorlevel% neq 0 goto ml64



perl ms\uplink-x86_64.pl nasm > ms\uptable.asm

nasm -f win64 -o ms\uptable.obj ms\uptable.asm

goto proceed



:ml64

perl ms\uplink-x86_64.pl masm > ms\uptable.asm

ml64 -c -Foms\uptable.obj ms\uptable.asm

perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak

perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak



:proceed

perl util\mk1mf.pl VC-WIN64A >ms\nt.mak

perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak



perl util\mkdef.pl 32 libeay > ms\libeay32.def

perl util\mkdef.pl 32 ssleay > ms\ssleay32.def

ms/do_win64i.bat

+3 −3
Original line number Diff line number Diff line 


perl util\mkfiles.pl >MINFO

perl ms\uplink.pl win64i > ms\uptable.asm

perl ms\uplink-ia64.pl > ms\uptable.asm

ias -o ms\uptable.obj ms\uptable.asm

perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak

perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak

perl util\mk1mf.pl VC-WIN64I >ms\nt.mak

perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak



perl util\mkdef.pl 32 libeay > ms\libeay32.def

perl util\mkdef.pl 32 ssleay > ms\ssleay32.def