Unify ppc assembler make rules.

[openssl.git] / crypto / bn / Makefile

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 3fd08e719a6f5651a4ffa98ec296cd31f1221ff3..d3799ba2a6669e271ce6f7d635a2e3fef40be541 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -62,27 +62,12 @@ lib:        $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
-# ELF
-bn86-elf.s:    asm/bn-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) bn-586.pl elf $(CFLAGS) > ../$@)
-co86-elf.s:    asm/co-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) co-586.pl elf $(CFLAGS) > ../$@)
-mo86-elf.s:    asm/x86-mont.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) x86-mont.pl elf $(CFLAGS) > ../$@)
-# COFF
-bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) bn-586.pl coff $(CFLAGS) > ../$@)
-co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) co-586.pl coff $(CFLAGS) > ../$@)
-mo86-cof.s: asm/x86-mont.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) x86-mont.pl coff $(CFLAGS) > ../$@)
-# a.out
-bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) bn-586.pl a.out $(CFLAGS) > ../$@)
-co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)
-mo86-out.s: asm/x86-mont.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) x86-mont.pl a.out $(CFLAGS) > ../$@)
+bn-586.s:      asm/bn-586.pl ../perlasm/x86asm.pl
+       $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+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) > $@
 
 sparcv8.o:     asm/sparcv8.S
        $(CC) $(CFLAGS) -c asm/sparcv8.S
@@ -99,6 +84,9 @@ bn-mips3.o:   asm/mips3.s
                as -$$ABI -O -o $@ asm/mips3.s; \
        else    $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
 
+bn-s390x.o:    asm/s390x.S
+       $(CC) $(CFLAGS) -c -o $@ asm/s390x.S
+
 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
@@ -115,22 +103,14 @@ pa-risc2.o: asm/pa-risc2.s
        /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
 
 # ppc - AIX, Linux, MacOS X...
-linux_ppc32.s: asm/ppc.pl;     $(PERL) $< $@
-linux_ppc64.s: asm/ppc.pl;     $(PERL) $< $@
-aix_ppc32.s: asm/ppc.pl;       $(PERL) asm/ppc.pl $@
-aix_ppc64.s: asm/ppc.pl;       $(PERL) asm/ppc.pl $@
-osx_ppc32.s: asm/ppc.pl;       $(PERL) $< $@
-osx_ppc64.s: asm/ppc.pl;       $(PERL) $< $@
-
-linux_ppc32-mont.s: asm/ppc-mont.pl;   $(PERL) $< $@
-linux_ppc64-mont.s: asm/ppc-mont.pl;   $(PERL) $< $@
-aix_ppc32-mont.s: asm/ppc-mont.pl;     $(PERL) asm/ppc-mont.pl $@
-aix_ppc64-mont.s: asm/ppc-mont.pl;     $(PERL) asm/ppc-mont.pl $@
-osx_ppc32-mont.s: asm/ppc-mont.pl;     $(PERL) $< $@
-osx_ppc64-mont.s: asm/ppc-mont.pl;     $(PERL) $< $@
+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) $@
 
 alpha-mont.s:  asm/alpha-mont.pl
-       $(PERL) $< | $(CC) -E - > $@
+       $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+
+# GNU make "catch all"
+%-mont.s:      asm/%-mont.pl;  $(PERL) $< $(CFLAGS) > $@
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO