diff options
| author | Andy Polyakov <appro@openssl.org> | 2004-07-18 16:19:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2004-07-18 16:19:34 +0000 |
| commit | d0590fe6b20b34b10b016e8d2807b8d3332ba89c (patch) | |
| tree | b1fe76ff69e3ca56b4cd18fb3881867b7f895f10 /crypto | |
| parent | 2232b10f5a4110d776789f43a7171c6c0d8b5a96 (diff) | |
Add anchors for AES, SHA-256/-512 assembler modules and SSE2 code pathes.
I also used this opportunity to clean up some out-of-date targets and
re-group targets by OS.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/aes/Makefile.ssl | 5 | ||||
| -rw-r--r-- | crypto/bn/Makefile.ssl | 11 | ||||
| -rw-r--r-- | crypto/sha/Makefile.ssl | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl index f353aeb697..3d3b274525 100644 --- a/crypto/aes/Makefile.ssl +++ b/crypto/aes/Makefile.ssl @@ -17,7 +17,8 @@ MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile.ssl AR= ar r -# CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr +AES_ASM_OBJ= + CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile @@ -27,7 +28,7 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c -LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o +LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o $(AES_ASM_OBJ) SRC= $(LIBSRC) diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index 490d6d7dae..61d9bf3493 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -98,17 +98,6 @@ asm/sparcv8.o: asm/sparcv8.S asm/sparcv8plus.o: asm/sparcv8plus.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. -asm/sparcv8plus-gcc27.o: asm/sparcv8plus.S - $(CC) $(ASFLAGS) -E asm/sparcv8plus.S | \ - /usr/ccs/bin/as -xarch=v8plus - -o asm/sparcv8plus-gcc27.o - - asm/ia64.o: asm/ia64.S # Some compiler drivers (most notably HP-UX and Intel C++) don't diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 21bbf96e9f..54f9921584 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -50,8 +50,8 @@ lib: $(LIBOBJ) # elf asm/sx86-elf.s: asm/sha1-586.pl ../perlasm/x86asm.pl (cd asm; $(PERL) sha1-586.pl elf $(CFLAGS) $(PROCESSOR) > sx86-elf.s) -asm/sse2-elf.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl - (cd asm; $(PERL) sha512-sse2.pl elf $(CFLAGS) $(PROCESSOR) > sse2-elf.s) +asm/s512sse2-elf.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl + (cd asm; $(PERL) sha512-sse2.pl elf $(CFLAGS) $(PROCESSOR) > s512sse2-elf.s) # a.out asm/sx86-out.o: asm/sx86unix.cpp |