10080 smatch Makefile changes for usr/src/cmd

          --- old/usr/src/cmd/sgs/ldd/Makefile.com
          +++ new/usr/src/cmd/sgs/ldd/Makefile.com

   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   23  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
       26 +# Copyright (c) 2018, Joyent, Inc.
  26   27  
  27   28  PROG=           ldd
  28   29  
  29   30  include         $(SRC)/cmd/Makefile.cmd
  30   31  include         $(SRC)/cmd/sgs/Makefile.com
  31   32  
  32   33  COMOBJ=         ldd.o
  33   34  BLTOBJ=         msg.o
  34   35  TOOLSOBJ=       alist.o
  35   36  

  36   37  OBJS=           $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
  37   38  
  38   39  MAPFILE=        $(MAPFILE.NGB)
  39   40  MAPOPTS=        $(MAPFILE:%=-M%)
  40   41  

  41   42  CPPFLAGS +=     -I. -I../../include -I../../include/$(MACH) \
  42   43                  -I$(SRCBASE)/uts/$(ARCH)/sys \
  43   44                  $(CPPFLAGS.master)
  44   45  LLDFLAGS =      '-R$$ORIGIN/../../lib'
  45   46  LLDFLAGS64 =    '-R$$ORIGIN/../../../lib/$(MACH64)'
  46   47  LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
  47   48  LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)
  48   49  LINTFLAGS +=    -x
  49   50  LINTFLAGS64 +=  -x
  50   51  
       52 +SMOFF += or_vs_and
       53 +
  51   54  BLTDEFS=        msg.h
  52   55  BLTDATA=        msg.c
  53   56  BLTMESG=        $(SGSMSGDIR)/ldd
  54   57  
  55   58  BLTFILES=       $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  56   59  
  57   60  SGSMSGCOM=      ../common/ldd.msg
  58   61  SGSMSGTARG=     $(SGSMSGCOM)
  59   62  SGSMSGALL=      $(SGSMSGCOM)
  60   63  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ldd_msg
  61   64  
  62   65  SRCS=           $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \
  63   66                  $(TOOLSOBJ:%.o=$(SGSTOOLS)/common/%.c)
  64   67  LINTSRCS=       $(SRCS) ../common/lintsup.c
  65   68  
  66   69  CLEANFILES +=   $(LINTOUTS) $(BLTFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX