6652716 Need an ARCFOUR implementation optimized for Intel EM64T
6665607 Need a SHA256/SHA384/SHA512 implementation optimized for 64-bit x86

@@ -20,19 +20,18 @@
 #
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident "@(#)Makefile   1.4     08/02/26 SMI"
+# ident "@(#)Makefile   1.5     08/03/20 SMI"
 #
 # lib/pkcs11/pkcs11_softtoken/amd64/Makefile
 
 AES_PSR_OBJECTS =
-ARCFOUR_PSR_OBJECTS =  arcfour_crypt_amd64.o
+ARCFOUR_PSR_OBJECTS =  arcfour-x86_64.o
 DES_PSR_OBJECTS =
 RSA_PSR_OBJECTS =
-SHA1_PSR_OBJECTS =
 BIGNUM_PSR_OBJECTS = bignum_amd64.o bignum_amd64_asm.o
 BIGNUM_PSR_PICS = $(BIGNUM_PSR_OBJECTS:%=pics/%)
 BIGNUM_CFG = -DPSR_MUL
 BIGNUM_PSR_SRCS = \
         $(BIGNUMDIR)/amd64/bignum_amd64.c \

@@ -41,21 +40,28 @@
 pics/bignum_amd64.o := amd64_COPTFLAG = -xO3
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
+#
+# Overrides
+#
+CLEANFILES      += arcfour-x86_64.s
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
 
 $(BIGNUM_PSR_PICS) := CFLAGS += $(C_BIGPICFLAGS) $(BIGNUM_CFG)
 
 LINTFLAGS64 += $(BIGNUM_CFG)
 
-pics/arcfour_crypt_amd64.o: $(ARCFOURDIR)/amd64/arcfour_crypt_amd64.s
-        $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) \
-                $(ARCFOURDIR)/amd64/arcfour_crypt_amd64.s
+pics/arcfour-x86_64.o: arcfour-x86_64.s
+        $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) ${@F:.o=.s}
         $(POST_PROCESS_O)
 
+arcfour-x86_64.s: $(ARCFOURDIR)/amd64/arcfour-x86_64.pl
+        $(PERL) $? $@
+
 pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.c
         $(COMPILE.c) -o $@ $(C_BIGPICFLAGS) $(BIGNUM_CFG) $<
         $(POST_PROCESS_O)
 
 pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.s