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/ld/Makefile.com
          +++ new/usr/src/cmd/sgs/ld/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) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2016 RackTop Systems.
  25   25  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  26   26  #
  27   27  
  28   28  PROG =          ld

  29   29  
  30   30  include         $(SRC)/cmd/Makefile.cmd
  31   31  include         $(SRC)/cmd/sgs/Makefile.com
  32   32  
  33   33  COMOBJS =       ld.o
  34   34  BLTOBJ =        msg.o
  35   35  
  36   36  OBJS =          $(BLTOBJ) $(COMOBJS)
  37   37  .PARALLEL:      $(OBJS)
  38   38  
  39      -MAPFILES =      ../common/mapfile-intf $(MAPFILE.NGB)
       39 +SRCDIR =        $(SGSHOME)/ld
       40 +
       41 +MAPFILES =      $(SRCDIR)/common/mapfile-intf $(MAPFILE.NGB)
  40   42  MAPOPTS =       $(MAPFILES:%=-M%)
  41   43  
  42      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
  43      -LDLIBS +=       $(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \
  44      -                    $(LDDBGLIBDIR) $(LDDBG_LIB) $(CONVLIBDIR) $(CONV_LIB)
       44 +LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
       45 +LDLIBS +=       $(LDLIBDIR) -lld $(ELFLIBDIR) -lelf \
       46 +                    $(LDDBGLIBDIR) -llddbg $(CONVLIBDIR) -lconv
  45   47  
  46   48  CERRWARN +=     -_gcc=-Wno-switch
  47   49  CERRWARN +=     -_gcc=-Wno-parentheses
  48   50  
  49      -native :=       LDFLAGS = -R$(SGSLIBDIR) $(ZNOVERSION)
  50      -native :=       LDLIBS = -L$(SGSLIBDIR) $(LD_LIB) -lelf $(CONVLIBDIR) \
  51      -                    $(CONV_LIB)
  52      -native :=       CPPFLAGS += -DNATIVE_BUILD
  53      -
  54   51  BLTDEFS=        msg.h
  55   52  BLTDATA=        msg.c
  56   53  BLTMESG=        $(SGSMSGDIR)/ld
  57   54  
  58   55  BLTFILES=       $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  59   56  
  60      -SGSMSGCOM=      ../common/ld.msg
       57 +SGSMSGCOM=      $(SRCDIR)/common/ld.msg
  61   58  SGSMSGTARG=     $(SGSMSGCOM)
  62   59  SGSMSGALL=      $(SGSMSGCOM)
  63   60  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ld_msg
  64   61  
  65      -SRCS=           $(MACHOBJS:%.o=%.c)  $(COMOBJS:%.o=../common/%.c)  $(BLTDATA)
       62 +SRCS=           $(MACHOBJS:%.o=%.c)  $(COMOBJS:%.o=$(SRCDIR)/common/%.c)  $(BLTDATA)
  66   63  
  67   64  CLEANFILES +=   $(BLTFILES)
  68   65  
  69   66  FILEMODE=       0755
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX