6652716 Need an ARCFOUR implementation optimized for Intel EM64T

          --- old/usr/src/lib/pkcs11/pkcs11_softtoken/amd64/Makefile
          +++ new/usr/src/lib/pkcs11/pkcs11_softtoken/amd64/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25      -# ident "@(#)Makefile   1.4     08/02/26 SMI"
       25 +# ident "@(#)Makefile   1.5     08/03/01 SMI"
  26   26  #
  27   27  # lib/pkcs11/pkcs11_softtoken/amd64/Makefile
  28   28  
  29   29  AES_PSR_OBJECTS =
  30      -ARCFOUR_PSR_OBJECTS =  arcfour_crypt_amd64.o
       30 +ARCFOUR_PSR_OBJECTS =  arcfour-x86_64.o
  31   31  DES_PSR_OBJECTS =
  32   32  RSA_PSR_OBJECTS =
  33   33  SHA1_PSR_OBJECTS =
  34   34  BIGNUM_PSR_OBJECTS = bignum_amd64.o bignum_amd64_asm.o
  35   35  BIGNUM_PSR_PICS = $(BIGNUM_PSR_OBJECTS:%=pics/%)
  36   36  BIGNUM_CFG = -DPSR_MUL
  37   37  BIGNUM_PSR_SRCS = \
  38   38          $(BIGNUMDIR)/amd64/bignum_amd64.c \
  39   39          $(BIGNUMDIR)/amd64/bignum_amd64_asm.s
  40   40  
  41   41  pics/bignum_amd64.o := amd64_COPTFLAG = -xO3
  42   42  
  43   43  include ../Makefile.com
  44   44  include ../../../Makefile.lib.64
  45   45  
       46 +#
       47 +# Overrides
       48 +#
       49 +CLEANFILES      += arcfour-x86_64.s
       50 +
  46   51  install: all $(ROOTLIBS64) $(ROOTLINKS64)
  47   52  
  48   53  $(BIGNUM_PSR_PICS) := CFLAGS += $(C_BIGPICFLAGS) $(BIGNUM_CFG)
  49   54  
  50   55  LINTFLAGS64 += $(BIGNUM_CFG)
  51   56  
  52      -pics/arcfour_crypt_amd64.o: $(ARCFOURDIR)/amd64/arcfour_crypt_amd64.s
  53      -        $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) \
  54      -                $(ARCFOURDIR)/amd64/arcfour_crypt_amd64.s
       57 +pics/arcfour-x86_64.o: arcfour-x86_64.s
       58 +        $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) ${@F:.o=.s}
  55   59          $(POST_PROCESS_O)
  56   60  
       61 +arcfour-x86_64.s: $(ARCFOURDIR)/amd64/arcfour-x86_64.pl
       62 +        $(PERL) $? $@
       63 +
  57   64  pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.c
  58   65          $(COMPILE.c) -o $@ $(C_BIGPICFLAGS) $(BIGNUM_CFG) $<
  59   66          $(POST_PROCESS_O)
  60   67  
  61   68  pics/%.o: $(BIGNUMDIR)/$(MACH64)/%.s
  62   69          $(COMPILE.s) -o $@ $(AS_BIGPICFLAGS) $(BIGNUM_CFG) $<
  63   70          $(POST_PROCESS_O)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX