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/rtld/Makefile.targ
          +++ new/usr/src/cmd/sgs/rtld/Makefile.targ

   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  # Copyright (c) 2019, Joyent, Inc.
  29   29  #
  30   30  
  31   31  # Don't generate separate sections for this module
  32   32  pics/debugdata.o :=     XFFLAG=
  33   33  
  34   34  # Since we use RTLD rather than DYNLIB, we must explicitly hook in ctfmerge.
  35   35  $(RTLD) :=      CTFMERGE_POST = $(CTFMERGE_LIB)
  36   36  
  37   37  pics/%.o:       %.s
  38   38                  $(BUILD.s)
  39   39                  $(POST_PROCESS_S_O)
  40   40  
  41   41  pics/%.o:       $(CRTSRCS)/%.s
  42   42                  $(BUILD.s)
  43   43                  $(POST_PROCESS_S_O)
  44   44  
  45   45  pics/%.o:       %.c
  46   46                  $(COMPILE.c) -o $@ $<
  47   47                  $(POST_PROCESS_O)
  48   48  
  49   49  pics/%.o:       ../common/%.c
  50   50                  $(COMPILE.c) -o $@ $<

  51   51                  $(POST_PROCESS_O)
  52   52  
  53   53  pics/%.o:       $(VAR_AVLDIR)/%.c
  54   54                  $(COMPILE.c) -o $@ $<
  55   55                  $(POST_PROCESS_O)
  56   56  
  57   57  pics/%.o:       $(VAR_DTRDIR)/%.c
  58   58                  $(COMPILE.c) -o $@ $<
  59   59                  $(POST_PROCESS_O)
  60   60  
  61      -pics/%.o:       $(SGSTOOLS)/common/%.c
       61 +pics/%.o:       $(SGSCOMMON)/%.c
  62   62                  $(COMPILE.c) -o $@ $<
  63   63                  $(POST_PROCESS_O)
  64   64  
  65      -pics/%.o:       $(SRCBASE)/uts/$(PLAT)/krtld/%.c
       65 +pics/%.o:       $(SRC)/uts/$(PLAT)/krtld/%.c
  66   66                  $(COMPILE.c) -o $@ $<
  67   67                  $(POST_PROCESS_O)
  68   68  
  69   69  pics/elfcap.o:  $(ELFCAP)/elfcap.c
  70   70                  $(COMPILE.c) -o $@ $(ELFCAP)/elfcap.c
  71   71                  $(POST_PROCESS_O)
  72   72  
  73   73  $(RTLD):        pics $(PICS) $(CRTS)
  74      -                $(LD_USE_PROTO)ld -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \
       74 +                $(LD) -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \
  75   75                      $(LDLIBS) $(CRTN)
  76   76                  $(POST_PROCESS_SO)
  77   77  
  78   78  delete:
  79   79                  -$(RM) $(RTLD)
  80   80  
  81   81  $(ROOTFS_LIBDIR)/%:     %
  82   82                  $(INS.file)
  83   83  
  84   84  $(ETCLIBDIR)/%:         %

  85   85                  $(INS.file)
  86   86  
  87   87  include         $(SRC)/lib/Makefile.targ
  88   88  include         $(SRC)/cmd/sgs/Makefile.targ
  89   89  
  90   90  # Derived source and header files (messaging).
  91   91  
  92   92  catalog:        $(BLTMESG)
  93   93  
  94   94  chkmsg :=       SGSMSGCHK=../common/rtld.chk.msg
  95   95  
  96   96  chkmsg:         $(SRCS) $(CHKSRCS)
  97   97                  sh $(CHKMSG) $(CHKMSGFLAGS) $(SRCS) $(CHKSRCS)
  98   98  
  99   99  $(BLTDEFS) + \
 100  100  $(BLTDATA) :    $(SGSMSGTARG)
 101  101                  $(SGSMSG) $(SGSMSGFLAGS2) $(SGSMSGTARG)
 102  102  
 103  103  $(BLTMESG) :    $(SGSMSGALL)
 104  104                  $(SGSMSG) $(SGSMSGFLAGS1) $(SGSMSGALL)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX