6652716 Need an ARCFOUR implementation optimized for Intel EM64T

@@ -20,11 +20,11 @@
 #
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident "@(#)Makefile   1.7     08/01/02 SMI"
+# ident "@(#)Makefile   1.8     08/03/20 SMI"
 #
 #       This makefile drives the production of the ARCFOUR KEF provider.
 #
 #       intel implementation architecture dependent
 #

@@ -39,11 +39,11 @@
 #       Define the module and object file sets.
 #
 MODULE          = arcfour
 LINTS           = $(ARCFOURPROV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ARCFOURPROV_OBJS_32 =
-ARCFOURPROV_OBJS_64 = arcfour_crypt_amd64.o
+ARCFOURPROV_OBJS_64 = arcfour-x86_64.o
 ARCFOURPROV_OBJS += $(ARCFOURPROV_OBJS_$(CLASS))
 OBJECTS         = $(ARCFOURPROV_OBJS:%=$(OBJS_DIR)/%)
 ROOTMODULE      = $(ROOT_CRYPTO_DIR)/$(MODULE)
 
 #

@@ -63,10 +63,11 @@
 
 #
 # Overrides
 #
 CPPFLAGS        += -I$(COM_DIR)
+CLEANFILES      += arcfour-x86_64.s
 
 #
 # For now, disable these lint checks; maintainers should endeavor
 # to investigate and remove these for maximum lint coverage.
 # Please do not carry these forward to new Makefiles.

@@ -97,12 +98,14 @@
 #
 #       Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
 
-$(OBJS_DIR)/arcfour_crypt_amd64.o: $(COM_DIR)/amd64/arcfour_crypt_amd64.s
-        $(COMPILE.s) -o $@ $(COM_DIR)/amd64/arcfour_crypt_amd64.s
+$(OBJS_DIR)/arcfour-x86_64.o: arcfour-x86_64.s
+        $(COMPILE.s) -o $@ ${@F:.o=.s}
         $(POST_PROCESS_O)
 
-$(OBJS_DIR)/arcfour_crypt_amd64.ln: $(COM_DIR)/amd64/arcfour_crypt_amd64.s
-        @($(LHEAD) $(LINT.c) $(COM_DIR)/amd64/arcfour_crypt_amd64.s $(LTAIL))
+$(OBJS_DIR)/arcfour-x86_64.ln: arcfour-x86_64.s
+        @($(LHEAD) $(LINT.s) ${@F:.ln=.s} $(LTAIL))
 
+arcfour-x86_64.s: $(COM_DIR)/amd64/arcfour-x86_64.pl
+        $(PERL) $? $@