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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/latencytop/Makefile
          +++ new/usr/src/cmd/latencytop/Makefile
↓ open down ↓ 10 lines elided ↑ open up ↑
  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 (c) 2008-2009, Intel Corporation.
  22   23  # All Rights Reserved.
  23   24  #
       25 +# Copyright (c) 2018, Joyent, Inc.
       26 +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  24   27  
  25   28  PROG = latencytop
       29 +OBJS = latencytop.o display.o dwrapper.o klog.o stat.o table.o util.o
  26   30  
  27   31  include ../Makefile.cmd
       32 +include ../Makefile.cmd.64
  28   33  
  29      -$(64ONLY)SUBDIRS= $(MACH)
  30      -$(BUILD64)SUBDIRS += $(MACH64)
       34 +CFLAGS += $(CCVERBOSE)
  31   35  
  32      -all     :=      TARGET = all
  33      -install :=      TARGET = install
  34      -clean   :=      TARGET = clean
  35      -clobber :=      TARGET = clobber
  36      -lint    :=      TARGET = lint
       36 +CERRWARN += $(CNOWARN_UNINIT)
  37   37  
       38 +# smatch has problems parsing the glib header files
       39 +SMATCH=off
       40 +
       41 +CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
       42 +        -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
       43 +CSTD = $(CSTD_GNU99)
       44 +LDLIBS += -lcurses -ldtrace
       45 +NATIVE_LIBS += libglib-2.0.so
       46 +all install     := LDLIBS += -lglib-2.0
       47 +
       48 +FILEMODE = 0555
       49 +
       50 +WRAPOBJ = latencytop_wrap.o
       51 +
       52 +CLEANFILES += $(OBJS) $(WRAPOBJ) ./latencytop_d ./latencytop_trans
       53 +
  38   54  .KEEP_STATE:
  39   55  
  40      -all install clean clobber lint: $(SUBDIRS)
       56 +all: $(PROG)
  41   57  
  42      -$(SUBDIRS):     FRC
  43      -        @cd $@; pwd; $(MAKE) $(TARGET)
       58 +install: all $(ROOTPROG)
  44   59  
  45      -FRC:
       60 +$(PROG): $(OBJS) $(WRAPOBJ)
       61 +        $(LINK.c) -o $@ $(OBJS) $(WRAPOBJ) $(LDLIBS)
       62 +        $(POST_PROCESS)
  46   63  
       64 +latencytop_d: latencytop.d
       65 +        $(CP) $^ $@
       66 +
       67 +latencytop_trans: latencytop.trans
       68 +        $(CP) $^ $@
       69 +
       70 +$(WRAPOBJ): latencytop_d latencytop_trans
       71 +        $(ELFWRAP) -64 -o $(WRAPOBJ) latencytop_d \
       72 +                latencytop_trans
       73 +
       74 +clean:
       75 +        $(RM) $(CLEANFILES)
       76 +
  47   77  include ../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX