11506 smatch resync

          --- old/usr/src/boot/sys/boot/Makefile.inc
          +++ new/usr/src/boot/sys/boot/Makefile.inc

   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   13  # Copyright 2017 Toomas Soome <tsoome@me.com>
       14 +# Copyright 2019 Joyent, Inc.
  14   15  #
  15   16  
  16   17  # loader.help build needs better awk
  17   18  AWK=            /usr/xpg4/bin/awk
  18   19  LD=             $(GNU_ROOT)/bin/gld
  19   20  OBJCOPY=        $(GNU_ROOT)/bin/gobjcopy
  20   21  OBJDUMP=        $(GNU_ROOT)/bin/gobjdump
  21   22  GSTRIP=         $(GNU_ROOT)/bin/gstrip
  22   23  
  23   24  # Default Console font setup.

  24   25  # We want it to be the same as kernel.
  25   26  # We build compressed, stripped down version of the default font, so we have
  26   27  # bare minimum for case we can not load font from the OS root.
  27   28  
  28   29  FONT=           8x16
  29   30  FONT_SRC=       ter-u16n.bdf
  30   31  FONT_DIR=       $(SRC)/data/consfonts
  31   32  
  32   33  PNGLITE=        $(SRC)/common/pnglite
  33   34  
  34   35  BOOTSRC=        $(SRC)/boot/sys/boot
  35   36  LIBSRC=         $(SRC)/boot/lib
  36   37  SASRC=          $(LIBSRC)/libstand
  37   38  ZFSSRC=         $(SASRC)/zfs
  38   39  ZLIB=           $(SRC)/contrib/zlib
  39   40  
  40   41  # set standard values
  41   42  AS_CPPFLAGS=
  42   43  CPPFLAGS=       -D_STANDALONE -_gcc=-nostdinc
  43   44  CFLAGS64=       -_gcc=-mno-red-zone
  44   45  

  45   46  CFLAGS=         -_gcc=-Os -_gcc=-fPIC -_gcc=-ffreestanding -_gcc=-fno-builtin
  46   47  CFLAGS +=       -_gcc=-ffunction-sections -_gcc=-fdata-sections
  47   48  CFLAGS +=       -_gcc=-mno-mmx -_gcc=-mno-3dnow -_gcc=-mno-sse -_gcc=-mno-sse2
  48   49  CFLAGS +=       -_gcc=-mno-sse3 -_gcc=-msoft-float
  49   50  CFLAGS +=       -_gcc=-mno-avx -_gcc=-mno-aes
  50   51  CFLAGS +=       -_gcc=-Wall
  51   52  CFLAGS +=       $(CCNOAUTOINLINE) $(CCNOREORDER) $(CSTD_GNU99)
  52   53  CCASFLAGS=      -fPIC -Wa,--divide
  53   54  ASFLAGS=        --divide
  54   55  
       56 +SMATCH_ =
       57 +SMATCH_on =
       58 +SMATCH_off = -_smatch=off
       59 +
  55   60  # smatch does not define __amd64 and __amd64__
  56   61  SMATCH_amd64=   -_smatch=-D__amd64 -_smatch=-D__amd64__
  57   62  
  58   63  # SMATCH_ARGS will bring in set of -Wno-* options.
  59   64  #CFLAGS +=      $(SMATCH_ARGS:%=-_smatch=%)
  60   65  CFLAGS +=       $(SMOFF:%=-_smatch=--disable=%)
  61   66  CFLAGS +=       $(SMATCH_$(MACHINE))
       67 +CFLAGS +=       $(SMATCH_$(SMATCH))
       68 +CFLAGS +=       -_smatch=--timeout=0
  62   69  
  63   70  COMPILE.S=      $(CC) $(SMATCH_off) $(CCASFLAGS) $(CPPFLAGS) -c
  64   71  
  65   72  ROOT_BOOT=      $(ROOT)/boot
  66   73  ROOTBOOTPROG=$(PROG:%=$(ROOT_BOOT)/%)
  67   74  
  68   75  $(ROOT_BOOT)/%: %
  69   76          $(INS.file)
  70   77  
  71   78  #.if ${MACHINE_CPUARCH} == "arm"
  72   79  # Do not generate movt/movw, because the relocation fixup for them does not
  73   80  # translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
  74   81  # Also, the fpu is not available in a standalone environment.
  75   82  #CFLAGS.clang+=  -mllvm -arm-use-movt=0
  76   83  #CFLAGS.clang+=  -mfpu=none
  77   84  #.endif
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX