11866 Use -fstack-protector-strong when available
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>
Change-Id: Iaffe3e8275a3e6a06cc430743cd6539ead38f736

          --- old/usr/src/uts/intel/qede/Makefile
          +++ new/usr/src/uts/intel/qede/Makefile

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the

   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.
   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13      -# Copyright (c) 2018, Joyent, Inc.
       13 +# Copyright 2019 Joyent, Inc.
  14   14  #
  15   15  
  16   16  UTSBASE = ../..
  17   17  
  18   18  MODULE          = qede
  19   19  OBJECTS         = $(QEDE_OBJS:%=$(OBJS_DIR)/%) $(QEDE_GEN_OBJS:%=$(OBJS_DIR)/%)
  20   20  ROOTMODULE      = $(ROOT_DRV_DIR)/$(MODULE)
  21   21  CONF_SRCDIR     = $(UTSBASE)/common/io/qede
  22   22  
  23   23  include $(UTSBASE)/intel/Makefile.intel

  24   24  
  25   25  #
  26   26  # Common definitions that are used by QLogic.
  27   27  #
  28   28  CPPFLAGS        += -D__inline=inline
  29   29  CPPFLAGS        += -D_inline=inline
  30   30  CPPFLAGS        += -DILLUMOS
  31   31  CPPFLAGS        += -DECORE_CONFIG_DIRECT_HWFN
  32   32  CPPFLAGS        += -DCONFIG_ECORE_L2
  33   33  
  34   34  #
  35   35  # Includes that are needed
  36   36  #
  37   37  CPPFLAGS        += -I$(UTSBASE)/common/io/qede
  38   38  CPPFLAGS        += -I$(UTSBASE)/common/io/qede/579xx/drivers/ecore
  39   39  CPPFLAGS        += -I$(UTSBASE)/common/io/qede/579xx/drivers/ecore/hsi_repository
  40   40  CPPFLAGS        += -I$(UTSBASE)/common/io/qede/579xx/hsi/
  41   41  CPPFLAGS        += -I$(UTSBASE)/common/io/qede/579xx/hsi/hw
  42   42  CPPFLAGS        += -I$(UTSBASE)/common/io/qede/579xx/hsi/mcp
  43   43  
  44   44  #
  45   45  # Temporarily gag these warnings for the moment. We'll work with
  46   46  # upstream to get them clean.

  47   47  #
  48   48  CERRWARN        += -_gcc=-Wno-unused-variable
  49   49  CERRWARN        += -_gcc=-Wno-unused-function
  50   50  
  51   51  # 3rd party module
  52   52  SMOFF += all_func_returns,indenting,no_if_block,deref_check,testing_index_after_use
  53   53  
  54   54  # real bug in qede_multicast()
  55   55  $(OBJS_DIR)/qede_gld.o := SMOFF += assign_vs_compare
  56   56  
       57 +#
       58 +# Unfortunately the default use of -fstack-protector-strong breaks the
       59 +# qede module. For the time being limit its use of stack-protector to
       60 +# the basic form (-fstack-protector).
       61 +#
       62 +STACKPROTECT=basic
       63 +
  57   64  ALL_TARGET      = $(BINARY) $(CONFMOD)
  58   65  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
  59   66  
  60   67  LDFLAGS         += -dy -N misc/mac
  61   68  
  62   69  .KEEP_STATE:
  63   70  
  64   71  def:            $(DEF_DEPS)
  65   72  
  66   73  all:            $(ALL_DEPS)

  67   74  
  68   75  clean:          $(CLEAN_DEPS)
  69   76  
  70   77  clobber:        $(CLOBBER_DEPS)
  71   78  
  72   79  lint:
  73   80  modlintlib:
  74   81  clean.lint:
  75   82  
  76   83  install:        $(INSTALL_DEPS)
  77   84  
  78   85  include $(UTSBASE)/intel/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX