Print this page
16446 dtrace consumers should not be isaexec'd
Change-Id: Ibf80c7283c421cba98e80dce272c6dd51d24bb87
        
*** 16,47 ****
  # fields enclosed by brackets "[]" replaced with your own identifying
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  # Copyright (c) 2008-2009, Intel Corporation.
  # All Rights Reserved.
  #
  
  PROG = latencytop
  
  include ../Makefile.cmd
  
! $(64ONLY)SUBDIRS= $(MACH)
! $(BUILD64)SUBDIRS += $(MACH64)
  
! all     :=      TARGET = all
! install :=      TARGET = install
! clean   :=      TARGET = clean
! clobber :=      TARGET = clobber
! lint    :=      TARGET = lint
  
  .KEEP_STATE:
  
! all install clean clobber lint: $(SUBDIRS)
  
! $(SUBDIRS):     FRC
!         @cd $@; pwd; $(MAKE) $(TARGET)
  
! FRC:
  
  include ../Makefile.targ
--- 16,77 ----
  # fields enclosed by brackets "[]" replaced with your own identifying
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
+ #
  # Copyright (c) 2008-2009, Intel Corporation.
  # All Rights Reserved.
  #
+ # Copyright (c) 2018, Joyent, Inc.
+ # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  
  PROG = latencytop
+ OBJS = latencytop.o display.o dwrapper.o klog.o stat.o table.o util.o
  
  include ../Makefile.cmd
+ include ../Makefile.cmd.64
  
! CFLAGS += $(CCVERBOSE)
  
! CERRWARN += $(CNOWARN_UNINIT)
  
+ # smatch has problems parsing the glib header files
+ SMATCH=off
+ 
+ CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
+         -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
+ CSTD = $(CSTD_GNU99)
+ LDLIBS += -lcurses -ldtrace
+ NATIVE_LIBS += libglib-2.0.so
+ all install     := LDLIBS += -lglib-2.0
+ 
+ FILEMODE = 0555
+ 
+ WRAPOBJ = latencytop_wrap.o
+ 
+ CLEANFILES += $(OBJS) $(WRAPOBJ) ./latencytop_d ./latencytop_trans
+ 
  .KEEP_STATE:
  
! all: $(PROG)
  
! install: all $(ROOTPROG)
  
! $(PROG): $(OBJS) $(WRAPOBJ)
!         $(LINK.c) -o $@ $(OBJS) $(WRAPOBJ) $(LDLIBS)
!         $(POST_PROCESS)
  
+ latencytop_d: latencytop.d
+         $(CP) $^ $@
+ 
+ latencytop_trans: latencytop.trans
+         $(CP) $^ $@
+ 
+ $(WRAPOBJ): latencytop_d latencytop_trans
+         $(ELFWRAP) -64 -o $(WRAPOBJ) latencytop_d \
+                 latencytop_trans
+ 
+ clean:
+         $(RM) $(CLEANFILES)
+ 
  include ../Makefile.targ