Print this page
16446 dtrace consumers should not be isaexec'd
Change-Id: Ibf80c7283c421cba98e80dce272c6dd51d24bb87

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/lockstat/Makefile
          +++ new/usr/src/cmd/lockstat/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      -# Common Development and Distribution License, Version 1.0 only
   6      -# (the "License").  You may not use this file except in compliance
   7      -# with the License.
        5 +# Common Development and Distribution License (the "License").
        6 +# You may not use this file except in compliance with the License.
   8    7  #
   9    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10    9  # or http://www.opensolaris.org/os/licensing.
  11   10  # See the License for the specific language governing permissions
  12   11  # and limitations under the License.
  13   12  #
  14   13  # When distributing Covered Code, include this CDDL HEADER in each
  15   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   15  # If applicable, add the following below this CDDL HEADER, with the
  17   16  # fields enclosed by brackets "[]" replaced with your own identifying
  18   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   18  #
  20   19  # CDDL HEADER END
  21   20  #
  22   21  #
  23      -# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
       22 +# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   23  # Use is subject to license terms.
  25   24  #
  26      -#ident  "%Z%%M% %I%     %E% SMI"
  27      -#
       25 +# Copyright (c) 2018, Joyent, Inc.
  28   26  
  29   27  PROG= lockstat
       28 +OBJS= lockstat.o sym.o
  30   29  
  31   30  include ../Makefile.cmd
       31 +include ../Makefile.cmd.64
  32   32  
  33      -$(64ONLY)SUBDIRS= $(MACH)
  34      -$(BUILD64)SUBDIRS += $(MACH64)
       33 +LDLIBS += -lelf -lkstat -ldtrace
       34 +CPPFLAGS += -D_ELF64
       35 +CFLAGS += $(CCVERBOSE)
       36 +CFLAGS64 += $(CCVERBOSE)
       37 +CERRWARN += $(CNOWARN_UNINIT)
  35   38  
  36      -all     :=      TARGET = all
  37      -install :=      TARGET = install
  38      -clean   :=      TARGET = clean
  39      -clobber :=      TARGET = clobber
  40      -lint    :=      TARGET = lint
       39 +SMOFF += index_overflow
  41   40  
       41 +FILEMODE= 0555
       42 +
       43 +CLEANFILES += $(OBJS)
       44 +
       45 +ROOTLINK = $(PROG:%=$(ROOTUSRSBIN64)/%)
       46 +
  42   47  .KEEP_STATE:
  43   48  
  44      -all:    $(SUBDIRS)
       49 +all: $(PROG)
  45   50  
  46      -clean clobber lint:     $(SUBDIRS)
       51 +install: all $(ROOTUSRSBINPROG) $(ROOTLINK)
  47   52  
  48      -install:        $(SUBDIRS)
  49      -        -$(RM) $(ROOTUSRSBINPROG)
  50      -        -$(LN) $(ISAEXEC) $(ROOTUSRSBINPROG)
       53 +$(ROOTLINK):
       54 +        $(RM) $@; $(SYMLINK) ../../sbin/$(@F) $@
  51   55  
  52      -$(SUBDIRS):     FRC
  53      -        @cd $@; pwd; $(MAKE) $(TARGET)
       56 +$(PROG):        $(OBJS)
       57 +        $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
       58 +        $(POST_PROCESS)
  54   59  
  55      -FRC:
       60 +clean:
       61 +        -$(RM) $(CLEANFILES)
  56   62  
       63 +%.o:    %.c
       64 +        $(COMPILE.c) $<
       65 +
  57   66  include ../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX