5196 The cw wrapper restricts gcc to -O2

          --- old/usr/src/uts/intel/arcfour/Makefile
          +++ new/usr/src/uts/intel/arcfour/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 +# Copyright 2014 Gary Mills
  22   23  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   24  # Use is subject to license terms.
  24   25  #
  25   26  #       This makefile drives the production of the ARCFOUR KEF provider.
  26   27  #
  27   28  #       Intel implementation architecture dependent
  28   29  #
  29   30  
  30   31  #
  31   32  #       Path to the base of the uts directory tree (usually /usr/src/uts).

  32   33  #
  33   34  UTSBASE = ../..
  34   35  COM_DIR = $(COMMONBASE)/crypto/arcfour
  35   36  
  36   37  #
  37   38  #       Define the module and object file sets.
  38   39  #
  39   40  MODULE          = arcfour
  40   41  LINTS           = $(ARCFOURPROV_OBJS:%.o=$(LINTS_DIR)/%.ln)
  41   42  ARCFOURPROV_OBJS_32 =
  42   43  ARCFOURPROV_OBJS_64 = arcfour-x86_64.o
  43   44  ARCFOURPROV_OBJS += $(ARCFOURPROV_OBJS_$(CLASS))
  44   45  OBJECTS         = $(ARCFOURPROV_OBJS:%=$(OBJS_DIR)/%)
  45   46  ROOTMODULE      = $(ROOT_CRYPTO_DIR)/$(MODULE)
  46   47  
  47   48  #
  48   49  #       Include common rules.
  49   50  #
  50   51  include $(UTSBASE)/intel/Makefile.intel
  51   52  
  52   53  #       set signing mode
  53   54  ELFSIGN_MOD     = $(ELFSIGN_CRYPTO)
  54   55  

  55   56  #
  56   57  #       Define targets
  57   58  #
  58   59  ALL_TARGET      = $(BINARY)
  59   60  LINT_TARGET     = $(MODULE).lint
  60   61  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
  61   62  
  62   63  #
  63   64  # Overrides
  64   65  #
       66 +COPTFLAG        = $(ADJUST_OPT2) -_cc=-xO4 -_gcc=-O2
       67 +COPTFLAG64      = $(ADJUST_OPT2) -_cc=-xO4 -_gcc=-O2
  65   68  CPPFLAGS        += -I$(COM_DIR)
  66      -CFLAGS          += -xO4 -xcrossfile
       69 +CFLAGS          += -xcrossfile
  67   70  CLEANFILES      += arcfour-x86_64.s
  68   71  
  69   72  #
  70   73  #       Default build targets.
  71   74  #
  72   75  .KEEP_STATE:
  73   76  
  74   77  def:            $(DEF_DEPS)
  75   78  
  76   79  all:            $(ALL_DEPS)

  77   80  
  78   81  clean:          $(CLEAN_DEPS)
  79   82  
  80   83  clobber:        $(CLOBBER_DEPS)
  81   84  
  82   85  lint:           $(LINT_DEPS)
  83   86  
  84   87  modlintlib:     $(MODLINTLIB_DEPS)
  85   88  
  86   89  clean.lint:     $(CLEAN_LINT_DEPS)
  87   90  
  88   91  install:        $(INSTALL_DEPS)
  89   92  
  90   93  #
  91   94  #       Include common targets.
  92   95  #
  93   96  include $(UTSBASE)/intel/Makefile.targ
  94   97  
  95   98  $(OBJS_DIR)/arcfour-x86_64.o: arcfour-x86_64.s
  96   99          $(COMPILE.s) -o $@ ${@F:.o=.s}
  97  100          $(POST_PROCESS_O)
  98  101  
  99  102  $(OBJS_DIR)/arcfour-x86_64.ln: arcfour-x86_64.s
 100  103          @($(LHEAD) $(LINT.s) ${@F:.ln=.s} $(LTAIL))
 101  104  
 102  105  arcfour-x86_64.s: $(COM_DIR)/amd64/arcfour-x86_64.pl
 103  106          $(PERL) $? $@

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX