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/elfwrap/Makefile.com
          +++ new/usr/src/cmd/sgs/elfwrap/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 2010 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  27   27  #
  28   28  
  29   29  PROG=           elfwrap
  30   30  
  31   31  include         $(SRC)/cmd/Makefile.cmd
  32   32  include         $(SRC)/cmd/sgs/Makefile.com

  33   33  
  34   34  COMOBJ =        main.o
  35   35  
  36   36  MACHOBJ =       machine.sparc.o machine.sparcv9.o \
  37   37                  machine.i386.o  machine.amd64.o
  38   38  
  39   39  COMOBJ32 =      elfwrap32.o
  40   40  
  41   41  COMOBJ64 =      elfwrap64.o
  42   42  
  43      -TOOLOBJS =      alist.o
       43 +SGSCOMMONOBJ =  alist.o
  44   44  
  45   45  BLTOBJ =        msg.o
  46   46  
  47   47  OBJS=           $(BLTOBJ) $(COMOBJ) $(MACHOBJ) $(COMOBJ32) $(COMOBJ64) \
  48      -                $(TOOLOBJS)
       48 +                $(SGSCOMMONOBJ)
  49   49  
  50   50  MAPFILES =      $(MAPFILE.NGB)
  51   51  MAPOPTS =       $(MAPFILES:%=-M%)
  52   52  
  53   53  CPPFLAGS =      -I. -I../common -I../../include $(CPPFLAGS.master) -I$(ELFCAP)
  54   54  LLDFLAGS =
  55   55  LLDFLAGS64 =
  56      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
  57      -LDLIBS +=       $(ELFLIBDIR) -lelf $(CONVLIBDIR) $(CONV_LIB)
       56 +LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(LLDFLAGS)
       57 +LDLIBS +=       $(ELFLIBDIR) -lelf $(CONVLIBDIR) -lconv
  58   58  
  59   59  CERRWARN +=     -_gcc=-Wno-uninitialized
  60   60  
  61   61  BLTDEFS =       msg.h
  62   62  BLTDATA =       msg.c
  63   63  BLTMESG =       $(SGSMSGDIR)/elfwrap
  64   64  
  65   65  BLTFILES =      $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  66   66  
  67   67  SGSMSGCOM =     ../common/elfwrap.msg
  68   68  SGSMSGTARG =    $(SGSMSGCOM)
  69   69  SGSMSGALL =     $(SGSMSGCOM)
  70   70  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfwrap_msg
  71   71  
  72   72  SRCS =          $(COMOBJ:%.o=../common/%.c) ../common/machine.c \
  73   73                  $(COMOBJ32:%32.o=../common/%.c) \
  74      -                $(TOOLOBJ:%.o=../../tools/common/%.c) $(BLTDATA)
       74 +                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) $(BLTDATA)
  75   75  
  76   76  CLEANFILES +=   $(BLTFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX