5072963 Need an optimized AES implementation for amd64

*** 20,43 ****
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # ident "@(#)Makefile   1.5     08/03/20 SMI"
  #
  # lib/pkcs11/pkcs11_softtoken/amd64/Makefile
  
! AES_PSR_OBJECTS =
  ARCFOUR_PSR_OBJECTS =  arcfour-x86_64.o
  DES_PSR_OBJECTS =
  RSA_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 \
!         $(BIGNUMDIR)/amd64/bignum_amd64_asm.s
  
  pics/bignum_amd64.o := amd64_COPTFLAG = -xO3
  
  include ../Makefile.com
  include ../../../Makefile.lib.64
--- 20,43 ----
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # ident "@(#)Makefile   1.6     08/05/23 SMI"
  #
  # lib/pkcs11/pkcs11_softtoken/amd64/Makefile
  
! AES_PSR_OBJECTS = aes_amd64.o aeskey.o
  ARCFOUR_PSR_OBJECTS = arcfour-x86_64.o
  DES_PSR_OBJECTS =
  RSA_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)/$(MACH64)/bignum_amd64.c \
!         $(BIGNUMDIR)/$(MACH64)/bignum_amd64_asm.s
  
  pics/bignum_amd64.o := amd64_COPTFLAG = -xO3
  
  include ../Makefile.com
  include ../../../Makefile.lib.64
*** 51,69 ****
  
  $(BIGNUM_PSR_PICS) := CFLAGS += $(C_BIGPICFLAGS) $(BIGNUM_CFG)
  
  LINTFLAGS64 += $(BIGNUM_CFG)
  
! 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
          $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) $(BIGNUM_CFG) $<
          $(POST_PROCESS_O)
--- 51,77 ----
  
  $(BIGNUM_PSR_PICS) := CFLAGS += $(C_BIGPICFLAGS) $(BIGNUM_CFG)
  
  LINTFLAGS64 += $(BIGNUM_CFG)
  
! pics/%.o: %.s
!         $(COMPILE.s) -o $@ $<
          $(POST_PROCESS_O)
  
! arcfour-x86_64.s: $(ARCFOURDIR)/$(MACH64)/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
          $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) $(BIGNUM_CFG) $<
+         $(POST_PROCESS_O)
+ 
+ pics/%.o: $(AESDIR)/$(MACH64)/%.c
+         $(COMPILE.c) -o $@ $(AESDIR)/$(MACH64)/${@F:.o=.c}
+         $(POST_PROCESS_O)
+ 
+ pics/%.o: $(AESDIR)/$(MACH64)/%.s
+         $(COMPILE.s) -o $@ $<
          $(POST_PROCESS_O)