5196 The cw wrapper restricts gcc to -O2

          --- old/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
          +++ new/usr/src/lib/pkcs11/libsoftcrypto/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  #
       23 +# Copyright 2014 Gary Mills
  23   24  # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  24   25  #
  25   26  
  26   27  LIBRARY =       libsoftcrypto.a
  27   28  VERS =          .1
  28   29  
  29   30  include         ../Makefile.com
  30   31  
  31   32  AES_PSM_OBJS =  aes_amd64.o aes_intel.o aeskey.o
  32   33  ARCFOUR_PSM_OBJS = arcfour-x86_64.o

  33   34  BIGNUM_PSM_OBJS = bignum_amd64.o bignum_amd64_asm.o
  34   35  
  35   36  include         $(SRC)/lib/Makefile.lib
  36   37  include         $(SRC)/lib/Makefile.lib.64
  37   38  
  38   39  CERRWARN +=     -_gcc=-Wno-type-limits
  39   40  CERRWARN +=     -_gcc=-Wno-parentheses
  40   41  CERRWARN +=     -_gcc=-Wno-uninitialized
  41   42  
  42   43  AES_PSM_SRC =   $(AES_DIR)/$(MACH64)/aes_amd64.s \
  43   44                  $(AES_DIR)/$(MACH64)/aes_intel.s \
  44   45                  $(AES_DIR)/$(MACH64)/aeskey.c
  45   46  ARCFOUR_PSM_SRC = arcfour-x86_64.s
  46   47  BIGNUM_PSM_SRC = $(BIGNUM_DIR)/$(MACH64)/bignum_amd64.c \
  47   48                  $(BIGNUM_DIR)/$(MACH64)/bignum_amd64_asm.s
  48   49  

  49   50  # Sources need to be redefined after Makefile.lib inclusion.
  50   51  SRCS =          $(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
  51   52                  $(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \
  52   53                  $(PAD_SRC)
  53   54  
  54   55  SRCDIR =        $(SRC)/lib/pkcs11/libsoftcrypto/common
  55   56  
  56   57  LIBS =          $(DYNLIB) $(LINTLIB)
  57   58  MAPFILEDIR =    ../common
  58   59  
  59      -CFLAGS +=       -xO4 -xcrossfile
       60 +COPTFLAG        = $(ADJUST_OPT2) -_cc=-xO4 -_gcc=-O2
       61 +COPTFLAG64      = $(ADJUST_OPT2) -_cc=-xO4 -_gcc=-O2
       62 +CFLAGS +=       -xcrossfile
  60   63  CPPFLAGS +=     -I$(CRYPTODIR) -I$(UTSDIR) -D_POSIX_PTHREAD_SEMANTICS
  61   64  ASFLAGS +=      $(AS_PICFLAGS) -P -D__STDC__ -D_ASM
  62   65  BIGNUM_FLAGS += -DPSR_MUL
  63   66  CLEANFILES +=   arcfour-x86_64.s
  64   67  LDLIBS +=       -lcryptoutil -lc
  65   68  LINTFLAGS64 +=  $(EXTRA_LINT_FLAGS)
  66   69  
  67   70  .KEEP_STATE:
  68   71  
  69   72  all:            $(LIBS)

  70   73  
  71   74  lint:           $(SRCS)
  72   75  
  73   76  install:        all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
  74   77  
  75   78  pics/%.o: $(AES_DIR)/$(MACH64)/%.c
  76   79                  $(COMPILE.c) $(AES_FLAGS) -o $@ $<
  77   80                  $(POST_PROCESS_O)
  78   81  
  79   82  pics/%.o: $(AES_DIR)/$(MACH64)/%.s
  80   83                  $(COMPILE.s) $(AES_FLAGS) -o $@ $<
  81   84                  $(POST_PROCESS_O)
  82   85  
  83   86  pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.c
  84   87                  $(COMPILE.c) $(BIGNUM_FLAGS) -o $@ $<
  85   88                  $(POST_PROCESS_O)
  86   89  
  87   90  pics/%.o: $(BIGNUM_DIR)/$(MACH64)/%.s
  88   91                  $(COMPILE64.s) $(BIGNUM_FLAGS) -o $@ $<
  89   92                  $(POST_PROCESS_O)
  90   93  
  91   94  include         ../Makefile.targ
  92   95  
  93   96  arcfour-x86_64.s: $(ARCFOUR_DIR)/amd64/arcfour-x86_64.pl
  94   97                  $(PERL) $? $@
  95   98  
  96   99  pics/%.o: arcfour-x86_64.s
  97  100                  $(COMPILE64.s) $(ARCFOUR_FLAGS) -o $@ $<
  98  101                  $(POST_PROCESS_O)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX