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/libelf/Makefile.com
          +++ new/usr/src/cmd/sgs/libelf/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  # Copyright 2015 Gary Mills
  23   23  # Copyright (c) 1990, 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  LIBRARY=        libelf.a
  29   29  VERS=           .1
  30   30  
  31   31  MACHOBJS=
  32   32  COMOBJS=        ar.o            begin.o         cntl.o          cook.o \
  33   33                  data.o          end.o           fill.o          flag.o \
  34   34                  getarhdr.o      getarsym.o      getbase.o       getdata.o \
  35   35                  getehdr.o       getident.o      getphdr.o       getscn.o \
  36   36                  getshdr.o \
  37   37                  getphnum.o      getshnum.o      getshstrndx.o \
  38   38                  hash.o          input.o         kind.o \
  39   39                  ndxscn.o        newdata.o       newehdr.o       newphdr.o \
  40   40                  newscn.o        next.o          nextscn.o       output.o \
  41   41                  rand.o          rawdata.o       rawfile.o       rawput.o \
  42   42                  strptr.o        update.o        error.o         gelf.o \
  43   43                  clscook.o       checksum.o
  44   44  CLASSOBJS=      clscook64.o     newehdr64.o     newphdr64.o     update64.o \

  45   45                  checksum64.o
  46   46  BLTOBJS=        msg.o           xlate.o         xlate64.o
  47   47  MISCOBJS=       String.o        args.o          demangle.o      nlist.o \
  48   48                  nplist.o
  49   49  MISCOBJS64=     nlist.o
  50   50  
  51   51  OBJECTS=        $(BLTOBJS)  $(MACHOBJS)  $(COMOBJS)  $(CLASSOBJS) $(MISCOBJS)
  52   52  
  53   53  include $(SRC)/lib/Makefile.lib
  54   54  
       55 +SRCDIR= $(SRC)/cmd/sgs/libelf
       56 +
  55   57  # Use the value of M4 set in Makefile.master via Makefile.lib
  56   58  
  57   59  DEMOFILES=      Makefile        00README        acom.c          dcom.c \
  58   60                  pcom.c          tpcom.c         dispsyms.c
  59      -DEMOFILESRCDIR= ../demo
       61 +DEMOFILESRCDIR= $(SRCDIR)/demo
  60   62  ROOTDEMODIRBASE=$(ROOT)/usr/demo/ELF
  61   63  ROOTDEMODIRS=   $(ROOTDEMODIRBASE)
  62   64  
  63   65  include $(SRC)/cmd/sgs/Makefile.com
  64   66  
  65      -MAPFILES =      ../common/mapfile-vers
       67 +MAPFILES =      $(SRCDIR)/common/mapfile-vers
  66   68  
  67   69  DYNFLAGS +=     $(VERSREF)
  68      -LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) -lc
       70 +LDLIBS +=       $(CONVLIBDIR) -lconv -lc
  69   71  
  70   72  CERRWARN +=     -_gcc=-Wno-parentheses
  71   73  CERRWARN +=     -_gcc=-Wno-uninitialized
  72   74  
  73   75  SMOFF += indenting
  74   76  
  75   77  BUILD.AR=       $(RM) $@ ; \
  76   78                  $(AR) q $@ `$(LORDER) $(OBJECTS:%=$(DIR)/%)| $(TSORT)`
  77   79                  $(POST_PROCESS_A)
  78   80  
  79   81  
  80   82  BLTDEFS=        msg.h
  81   83  BLTDATA=        msg.c
  82   84  BLTMESG=        $(SGSMSGDIR)/libelf
  83   85  
  84   86  BLTFILES=       $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  85   87  
  86      -SGSMSGCOM=      ../common/libelf.msg
  87      -SGSMSG32=       ../common/libelf.32.msg
       88 +SGSMSGCOM=      $(SRCDIR)/common/libelf.msg
       89 +SGSMSG32=       $(SRCDIR)/common/libelf.32.msg
  88   90  SGSMSGTARG=     $(SGSMSGCOM)
  89   91  SGSMSGALL=      $(SGSMSGCOM) $(SGSMSG32)
  90   92  
  91   93  SGSMSGFLAGS1=   $(SGSMSGFLAGS) -m $(BLTMESG)
  92   94  SGSMSGFLAGS2=   $(SGSMSGFLAGS) -h $(BLTDEFS) -d $(BLTDATA) -n libelf_msg
  93   95  
  94   96  BLTSRCS=        $(BLTOBJS:%.o=%.c)
  95      -LIBSRCS=        $(COMOBJS:%.o=../common/%.c)  $(MISCOBJS:%.o=../misc/%.c) \
       97 +LIBSRCS=        $(COMOBJS:%.o=$(SRCDIR)/common/%.c)  $(MISCOBJS:%.o=$(SRCDIR)/misc/%.c) \
  96   98                  $(MACHOBJS:%.o=%.c)  $(BLTSRCS)
  97   99  
  98  100  ROOTFS_DYNLIB=          $(DYNLIB:%=$(ROOTFS_LIBDIR)/%)
  99  101  
 100  102  ROOTFS_DYNLIB64=        $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
 101  103  
 102  104  $(ROOTFS_DYNLIB) :=     FILEMODE= 755
 103  105  $(ROOTFS_DYNLIB64) :=   FILEMODE= 755
 104  106  
 105  107  LIBS =          $(DYNLIB)
 106  108  
 107  109  CLEANFILES +=   $(BLTSRCS) $(BLTFILES)
 108  110  
 109  111  .PARALLEL:      $(LIBS)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX