OS-3643 lx brand: add USDT provider to lx_brand.so.1
OS-3644 lx brand: ptrace_init() never called

          --- old/usr/src/Makefile.master.64.man.txt
          +++ new/usr/src/Makefile.master.64.man.txt

   1    1  ()                                                                          ()
   2    2  
   3    3  
   4    4  
   5    5  # # CDDL HEADER START # # The contents of this file are subject to the terms
   6    6  of the # Common Development and Distribution License (the "License").  # You

   7    7  may not use this file except in compliance with the License.  # # You can
   8    8  obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or
   9    9  http://www.opensolaris.org/os/licensing.  # See the License for the specific
  10   10  language governing permissions # and limitations under the License.  # # When
  11   11  distributing Covered Code, include this CDDL HEADER in each # file and include
  12   12  the License file at usr/src/OPENSOLARIS.LICENSE.  # If applicable, add the
  13   13  following below this CDDL HEADER, with the # fields enclosed by brackets "[]"
  14   14  replaced with your own identifying # information: Portions Copyright [yyyy]
  15   15  [name of copyright owner] # # CDDL HEADER END # # # Copyright (c) 1997, 2010,
  16   16  Oracle and/or its affiliates. All rights reserved.  # Copyright 2014 Garrett
  17      -D'Amore <garrett@damore.org> #
       17 +D'Amore <garrett@damore.org> # Copyright (c) 2014 Joyent, Inc.  All rights
       18 +reserved.  #
  18   19  
  19   20  # rebind basic build macros to 64-bit versions
  20   21  
  21   22  CFLAGS=        $(CFLAGS64) CCFLAGS=     $(CCFLAGS64) COPTFLAG=   $(COPTFLAG64)
  22   23  CCOPTFLAG=     $(CCOPTFLAG64) COMPILE.c=     $(COMPILE64.c) COMPILE.cc=
  23   24       $(COMPILE64.cc) COMPILE.s=    $(COMPILE64.s) COMPILE.d=     $(COMPILE64.d)
  24   25  COMPILE.b=     $(COMPILE64.b) LINK.c=        $(LINK64.c) LINK.cc=
  25   26       $(LINK64.cc) LINT.c=          $(LINT64.c)
  26   27  
  27   28  CTF_FLAGS=     $(CTF_FLAGS_64)

  28   29  
  29   30  OFFSETS_CREATE=     $(OFFSETS_CREATE64)
  30   31  
  31   32  # # Moved these up to the top level here, so they can be overridden #
  32   33  LDLIBS.cmd =   $(LDLIBS64) LDLIBS.lib = $(LDLIBS64)
  33   34  
  34   35  # # Override Makefile.master's settings of GCCLIBDIR # GCCLIBDIR=

  35   36       $(GCCLIBDIR64)
  36   37  
  37   38  # # Override Makefile.master's settings of CC, CCC, AS and LINT # CC=
  38   39            $($(MACH64)_CC) CCC=          $($(MACH64)_CCC) CPP=         $($(MACH64)_CPP)
  39   40  AS=       $($(MACH64)_AS) LD=      $($(MACH64)_LD) LINT=
  40   41            $($(MACH64)_LINT)
  41   42  
  42   43  REAL_CC=  $(CW_CC_CMD:sh) REAL_CCC=     $(CW_CCC_CMD:sh)
  43   44  
  44   45  BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS)           $(PICS)
  45      -$(EXTPICS) -L $(ROOTLIBDIR64) $(LDLIBS)
       46 +$(EXTPICS) $(USDT_PICS) -L $(ROOTLIBDIR64) $(LDLIBS)
  46   47  
  47   48  # # ld(1) requires the -64 option to create a 64-bit filter solely from a
  48   49  mapfile # MAPFILECLASS=  -64
  49   50  
  50   51  CCNEEDED =          -lCrun $(__GNUC64)CCNEEDED =  -L$(GCCLIBDIR) -lstdc++
  51   52  $(__GNUC64)CCNEEDED +=   -lgcc_s
  52   53  
  53   54  BUILDCCC.SO=    $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS)        $(PICS)
  54   55  $(EXTPICS) $(LDLIBS) $(CCNEEDED) MAPFILE.NGB =    $(MAPFILE.NGB_$(MACH64))
  55   56  
  56   57  
  57   58  
  58   59                                  October 5, 2016                             ()
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX