Commit 4afba1f3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Mafiles updates to accomodate assembler update from HEAD.

parent 5999d45a

crypto/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -69,14 +69,13 @@ applink.o: $(TOP)/ms/applink.c 
uplink.o:	$(TOP)/ms/uplink.c applink.o

	$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c



uplink-cof.s:	$(TOP)/ms/uplink.pl

	$(PERL) $(TOP)/ms/uplink.pl coff > $@

uplink-x86.s:	$(TOP)/ms/uplink-x86.pl

	$(PERL) $(TOP)/ms/uplink-x64.pl $(PERLASM_SCHEME) > $@



x86_64cpuid.s: x86_64cpuid.pl

	$(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@

ia64cpuid.s: ia64cpuid.S

	$(CC) $(CFLAGS) -E ia64cpuid.S > $@

x86_64cpuid.s: x86_64cpuid.pl;	$(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@

ia64cpuid.s: ia64cpuid.S;	$(CC) $(CFLAGS) -E ia64cpuid.S > $@

ppccpuid.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@

pariscid.s:	pariscid.pl;	$(PERL) pariscid.pl $(PERLASM_SCHEME) $@

alphacpuid.s:	alphacpuid.pl

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null

crypto/aes/Makefile

+14 −1
Original line number Diff line number Diff line
@@ -50,11 +50,17 @@ aes-ia64.s: asm/aes-ia64.S 


aes-586.s:	asm/aes-586.pl ../perlasm/x86asm.pl

	$(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

vpaes-x86.s:	asm/vpaes-x86.pl ../perlasm/x86asm.pl

	$(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

aesni-x86.s:	asm/aesni-x86.pl ../perlasm/x86asm.pl

	$(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@



aes-x86_64.s: asm/aes-x86_64.pl

	$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@

vpaes-x86_64.s:	asm/vpaes-x86_64.pl

	$(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@

bsaes-x86_64.s:	asm/bsaes-x86_64.pl

	$(PERL) asm/bsaes-x86_64.pl $(PERLASM_SCHEME) > $@

aesni-x86_64.s: asm/aesni-x86_64.pl

	$(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@

aesni-sha1-x86_64.s:	asm/aesni-sha1-x86_64.pl
@@ -66,8 +72,15 @@ aes-sparcv9.s: asm/aes-sparcv9.pl 
aes-ppc.s:	asm/aes-ppc.pl

	$(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@



aes-parisc.s:	asm/aes-parisc.pl

	$(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@



aes-mips.S:	asm/aes-mips.pl

	$(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@



# GNU make "catch all"

aes-%.s:	asm/aes-%.pl;	$(PERL) $< $(CFLAGS) > $@

aes-%.S:	asm/aes-%.pl;	$(PERL) $< $(PERLASM_SCHEME) > $@

aes-armv4.o:	aes-armv4.S



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/bn/Makefile

+22 −1
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ co-586.s: asm/co-586.pl ../perlasm/x86asm.pl 
	$(PERL) asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

x86-mont.s:	asm/x86-mont.pl ../perlasm/x86asm.pl

	$(PERL) asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

x86-gf2m.s:	asm/x86-gf2m.pl ../perlasm/x86asm.pl

	$(PERL) asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@



sparcv8.o:	asm/sparcv8.S

	$(CC) $(CFLAGS) -c asm/sparcv8.S
@@ -82,18 +84,31 @@ bn-mips3.o: asm/mips3.s 
		as -$$ABI -O -o $@ asm/mips3.s; \

	else	$(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi



bn-mips.s:	asm/mips.pl

	$(PERL) asm/mips.pl $(PERLASM_SCHEME) $@

mips-mont.s:	asm/mips-mont.pl

	$(PERL)	asm/mips-mont.pl $(PERLASM_SCHEME) $@



bn-s390x.o:	asm/s390x.S

	$(CC) $(CFLAGS) -c -o $@ asm/s390x.S

s390x-gf2m.s:	asm/s390x-gf2m.pl

	$(PERL) asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@



x86_64-gcc.o:	asm/x86_64-gcc.c

	$(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c

x86_64-mont.s:	asm/x86_64-mont.pl

	$(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@

x86_64-mont5.s:	asm/x86_64-mont5.pl

	$(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@

x86_64-gf2m.s:	asm/x86_64-gf2m.pl

	$(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@

modexp512-x86_64.s:	asm/modexp512-x86_64.pl

	$(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@



bn-ia64.s:	asm/ia64.S

	$(CC) $(CFLAGS) -E asm/ia64.S > $@

ia64-mont.s:	asm/ia64-mont.pl

	$(PERL) asm/ia64-mont.pl $@ $(CFLAGS)



# GNU assembler fails to compile PA-RISC2 modules, insist on calling

# vendor assembler...
@@ -101,16 +116,22 @@ pa-risc2W.o: asm/pa-risc2W.s 
	/usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s

pa-risc2.o: asm/pa-risc2.s

	/usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s

parisc-mont.s:	asm/parisc-mont.pl

	$(PERL) asm/parisc-mont.pl $(PERLASM_SCHEME) $@



# ppc - AIX, Linux, MacOS X...

bn-ppc.s:	asm/ppc.pl;	$(PERL) asm/ppc.pl $(PERLASM_SCHEME) $@

ppc-mont.s:	asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@

ppc64-mont.s:	asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@



alpha-mont.s:	asm/alpha-mont.pl

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null



# GNU make "catch all"

%-mont.s:	asm/%-mont.pl;	$(PERL) $< $(CFLAGS) > $@

%-mont.s:	asm/%-mont.pl;	$(PERL) $< $(PERLASM_SCHEME) $@

%-gf2m.S:	asm/%-gf2m.pl;	$(PERL) $< $(PERLASM_SCHEME) $@



armv4-gf2m.o:	armv4-gf2m.S



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/rc4/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl 
rc4-ia64.S: asm/rc4-ia64.pl

	$(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@



rc4-s390x.s:	asm/rc4-s390x.pl

	$(PERL) asm/rc4-s390x.pl > $@

rc4-parisc.s:	asm/rc4-parisc.pl

	$(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@



rc4-ia64.s: rc4-ia64.S

	@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
@@ -62,6 +62,9 @@ rc4-ia64.s: rc4-ia64.S 
	*)	exit 1 ;; \

	esac



# GNU make "catch all"

rc4-%.s:	asm/rc4-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/sha/Makefile

+20 −5
Original line number Diff line number Diff line
@@ -56,8 +56,11 @@ sha256-ia64.s: asm/sha512-ia64.pl 
sha512-ia64.s: asm/sha512-ia64.pl

	(cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))



sha256-armv4.s: asm/sha256-armv4.pl

	$(PERL) $< $@

sha256-armv4.S: asm/sha256-armv4.pl

	$(PERL) $< $(PERLASM_SCHEME) $@



sha1-alpha.s:	asm/sha1-alpha.pl

	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null



# Solaris make has to be explicitly told

sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
@@ -71,10 +74,22 @@ sha1-ppc.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@ 
sha256-ppc.s:	asm/sha512-ppc.pl;	$(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@

sha512-ppc.s:	asm/sha512-ppc.pl;	$(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@



sha1-parisc.s:	asm/sha1-parisc.pl;	$(PERL) asm/sha1-parisc.pl $(PERLASM_SCHEME) $@

sha256-parisc.s:asm/sha512-parisc.pl;	$(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@

sha512-parisc.s:asm/sha512-parisc.pl;	$(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@



sha1-mips.S:	asm/sha1-mips.pl;	$(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@

sha256-mips.S:	asm/sha512-mips.pl;	$(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@

sha512-mips.S:	asm/sha512-mips.pl;	$(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@



# GNU make "catch all"

sha1-%.s:	asm/sha1-%.pl;		$(PERL) $< $@

sha256-%.s:	asm/sha512-%.pl;	$(PERL) $< $@

sha512-%.s:	asm/sha512-%.pl;	$(PERL) $< $@

sha1-%.S:	asm/sha1-%.pl;		$(PERL) $< $(PERLASM_SCHEME) $@

sha256-%.S:	asm/sha512-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@

sha512-%.S:	asm/sha512-%.pl;	$(PERL) $< $(PERLASM_SCHEME) $@



sha1-armv4-large.o:	sha1-armv4-large.S

sha256-armv4.o:		sha256-armv4.S

sha512-armv4.o:		sha512-armv4.S



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO