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.targ
          +++ new/usr/src/cmd/sgs/elfwrap/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 2008 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  %.o:            ../common/%.c
  30   30                  $(COMPILE.c) -o $@ $<

  31   31                  $(POST_PROCESS_O)
  32   32  
  33   33  %32.o:          ../common/%.c
  34   34                  $(COMPILE.c) -o $@ $<
  35   35                  $(POST_PROCESS_O)
  36   36  
  37   37  %64.o:          ../common/%.c
  38   38                  $(COMPILE.c) -D_ELF64 -o $@ $<
  39   39                  $(POST_PROCESS_O)
  40   40  
  41      -%.o:            $(SGSTOOLS)/common/%.c
       41 +%.o:            $(SGSCOMMON)/%.c
  42   42                  $(COMPILE.c) -o $@ $<
  43   43                  $(POST_PROCESS_O)
  44   44  
  45   45  %.sparc.o:      ../common/%.c
  46   46                  $(COMPILE.c) -DELFWRAP_SPARC -o $@ $<
  47   47                  $(POST_PROCESS_O)
  48   48  
  49   49  %.sparcv9.o:    ../common/%.c
  50   50                  $(COMPILE.c) -DELFWRAP_SPARC -D_ELF64 -o $@ $<
  51   51                  $(POST_PROCESS_O)

  52   52  
  53   53  %.i386.o:       ../common/%.c
  54   54                  $(COMPILE.c) -DELFWRAP_X86 -o $@ $<
  55   55                  $(POST_PROCESS_O)
  56   56  
  57   57  %.amd64.o:      ../common/%.c
  58   58                  $(COMPILE.c) -DELFWRAP_X86 -D_ELF64 -o $@ $<
  59   59                  $(POST_PROCESS_O)
  60   60  
  61   61  $(PROG):        $(OBJS) $(MAPFILES)
  62   62                  $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  63   63                  $(POST_PROCESS)
  64   64  
  65   65  all:            $(PROG)
  66   66  
  67   67  clean:
  68   68                  $(RM) $(OBJS) $(CLEANFILES)
  69   69  
  70   70  delete:
  71   71                  $(RM) $(PROG)
  72   72  
  73   73  install \
  74   74  package:        all $(ROOTPROG)
  75   75  
  76   76  include         $(SRC)/cmd/Makefile.targ
  77   77  include         $(SRC)/cmd/sgs/Makefile.targ
  78   78  
  79   79  # Derived source and header files (messaging).
  80   80  
  81   81  catalog:        $(BLTMESG)
  82   82  
  83   83  chkmsg:         $(SRCS)
  84   84                  sh $(CHKMSG) $(CHKMSGFLAGS) $(SRCS)
  85   85  
  86   86  $(BLTDEFS) + \
  87   87  $(BLTDATA) + \
  88   88  $(BLTMESG):     $(SGSMSGALL)
  89   89                  $(SGSMSG) $(SGSMSGFLAGS) $(SGSMSGALL)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX