Unify sparcv9 assembler naming and build rules among 32- and 64-bit builds.

[openssl.git] / crypto / md5 / Makefile

diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 206bb122b8efde4dd12ec0ff13b11ef47b679312..495039770d46bee58c9e3daecebd9ff5a82f5098 100644 (file)
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -8,8 +8,6 @@ CC=     cc
 CPP=    $(CC) -E
 INCLUDES=-I.. -I$(TOP) -I../../include
 CFLAG=-g
-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=       Makefile
 AR=             ar r
 
@@ -54,26 +52,16 @@ mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl
 mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
        (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
 
-md5-sparcv8plus.o: asm/md5-sparcv9.S
-       $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
-               -o md5-sparcv8plus.o asm/md5-sparcv9.S
-
-# Old GNU assembler doesn't understand V9 instructions, so we
-# hire /usr/ccs/bin/as to do the job. Note that option is called
-# *-gcc27, but even gcc 2>=8 users may experience similar problem
-# if they didn't bother to upgrade GNU assembler. Such users should
-# not choose this option, but be adviced to *remove* GNU assembler
-# or upgrade it.
-md5-sparcv8plus-gcc27.o: asm/md5-sparcv9.S
-       $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -E asm/md5-sparcv9.S | \
-               /usr/ccs/bin/as -xarch=v8plus - -o md5-sparcv8plus-gcc27.o
-
 md5-sparcv9.o: asm/md5-sparcv9.S
        $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \
                -o md5-sparcv9.o asm/md5-sparcv9.S
 
 md5-x86_64.s:  asm/md5-x86_64.pl;      $(PERL) asm/md5-x86_64.pl $@
 
+md5-ia64.s: asm/md5-ia64.S
+       $(CC) $(CFLAGS) -E asm/md5-ia64.S | \
+       $(PERL) -ne 's/;\s+/;\n/g; print;' > $@
+
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -99,6 +87,7 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
+       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean: