11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools

          --- old/usr/src/cmd/sgs/elfdump/Makefile.com
          +++ new/usr/src/cmd/sgs/elfdump/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 (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2018, Joyent, Inc.
  25   25  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  26   26  #
  27   27  
  28   28  PROG=           elfdump
  29   29  
  30   30  include         $(SRC)/cmd/Makefile.cmd
  31   31  include         $(SRC)/cmd/sgs/Makefile.com

  32   32  
  33   33  COMOBJ =        main.o                  corenote.o \
  34   34                  dwarf.o                 struct_layout.o \
  35   35                  struct_layout_i386.o    struct_layout_amd64.o \
  36   36                  struct_layout_sparc.o   struct_layout_sparcv9.o
  37   37  
  38   38  COMOBJ32 =      elfdump32.o fake_shdr32.o
  39   39  
  40   40  COMOBJ64 =      elfdump64.o fake_shdr64.o
  41   41  
  42      -TOOLOBJ =       leb128.o
       42 +SGSCOMMONOBJ =  leb128.o
  43   43  
  44   44  BLTOBJ =        msg.o
  45   45  
  46      -OBJS=           $(BLTOBJ) $(COMOBJ) $(COMOBJ32) $(COMOBJ64) $(TOOLOBJ)
       46 +OBJS=           $(BLTOBJ) $(COMOBJ) $(COMOBJ32) $(COMOBJ64) $(SGSCOMMONOBJ)
  47   47  
  48   48  MAPFILE=        $(MAPFILE.NGB)
  49   49  MAPOPT=         $(MAPFILE:%=-M%)
  50   50  
  51   51  CPPFLAGS=       -I. -I../common -I../../include -I../../include/$(MACH) \
  52      -                -I$(SRCBASE)/lib/libc/inc -I$(SRCBASE)/uts/$(ARCH)/sys \
       52 +                -I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(ARCH)/sys \
  53   53                  $(CPPFLAGS.master) -I$(ELFCAP)
  54   54  LLDFLAGS =      $(VAR_ELFDUMP_LLDFLAGS)
  55   55  LLDFLAGS64 =    $(VAR_ELFDUMP_LLDFLAGS64)
  56      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) $(LLDFLAGS)
  57      -LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
  58      -                    $(CONVLIBDIR) $(CONV_LIB)
       56 +LDFLAGS +=      $(VERSREF) $(MAPOPT) $(LLDFLAGS)
       57 +LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \
       58 +                    $(CONVLIBDIR) -lconv
  59   59  
  60   60  CERRWARN +=     -_gcc=-Wno-uninitialized
  61   61  
  62   62  # not linted
  63   63  SMATCH=off
  64   64  
  65   65  BLTDEFS =       msg.h
  66   66  BLTDATA =       msg.c
  67   67  BLTMESG =       $(SGSMSGDIR)/elfdump
  68   68  
  69   69  BLTFILES =      $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  70   70  
  71   71  SGSMSGCOM =     ../common/elfdump.msg
  72   72  SGSMSGTARG =    $(SGSMSGCOM)
  73   73  SGSMSGALL =     $(SGSMSGCOM)
  74   74  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfdump_msg
  75   75  
  76   76  SRCS =          $(COMOBJ:%.o=../common/%.c) \
  77   77                  $(COMOBJ32:%32.o=../common/%.c) \
  78      -                $(TOOLOBJ:%.o=../../tools/common/%.c) $(BLTDATA)
       78 +                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) $(BLTDATA)
  79   79  
  80   80  CLEANFILES +=   $(BLTFILES) gen_struct_layout
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX