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/liblddbg/Makefile.com
          +++ new/usr/src/cmd/sgs/liblddbg/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  LIBRARY =       liblddbg.a
  29   29  VERS =          .4
  30   30  
  31   31  COMOBJS =       args.o          audit.o         basic.o         debug.o \
  32   32                  syminfo.o       tls.o
  33   33  
  34   34  COMOBJS32 =     bindings32.o    cap32.o         dlfcns32.o      dynamic32.o \
  35   35                  elf32.o         entry32.o       files32.o       got32.o \
  36   36                  libs32.o        map32.o         move32.o        phdr32.o \
  37   37                  relocate32.o    sections32.o    segments32.o    shdr32.o \
  38   38                  statistics32.o  support32.o     syms32.o        unused32.o \
  39   39                  util32.o        version32.o

  40   40  
  41   41  COMOBJS64 =     bindings64.o    cap64.o         dlfcns64.o      dynamic64.o \
  42   42                  elf64.o         entry64.o       files64.o       got64.o \
  43   43                  libs64.o        map64.o         move64.o        phdr64.o \
  44   44                  relocate64.o    sections64.o    segments64.o    shdr64.o \
  45   45                  statistics64.o  support64.o     syms64.o        unused64.o \
  46   46                  util64.o        version64.o
  47   47  
  48   48  BLTOBJ =        msg.o
  49   49  
  50      -TOOLOBJ =       alist.o
       50 +SGSCOMMONOBJ =  alist.o
  51   51  
  52      -OBJECTS =       $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(TOOLOBJ)
       52 +OBJECTS =       $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(SGSCOMMONOBJ)
  53   53  
  54   54  
  55   55  include         $(SRC)/lib/Makefile.lib
  56   56  include         $(SRC)/cmd/sgs/Makefile.com
  57   57  
  58      -SRCDIR =        ../common
       58 +SRCDIR =        $(SGSHOME)/liblddbg
       59 +MAPFILEDIR =    $(SRCDIR)/common
  59   60  
  60   61  CERRWARN +=     -_gcc=-Wno-unused-value
  61   62  CERRWARN +=     -_gcc=-Wno-uninitialized
  62   63  CERRWARN +=     -_gcc=-Wno-parentheses
  63   64  
  64      -CPPFLAGS +=     -I$(SRCBASE)/lib/libc/inc
  65      -DYNFLAGS +=     $(VERSREF) $(CC_USE_PROTO) '-R$$ORIGIN'
  66      -LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) -lc
  67      -
  68      -native :=       DYNFLAGS        += $(CONVLIBDIR)
  69      -native :=       CPPFLAGS        += -DNATIVE_BUILD
       65 +CPPFLAGS +=     -I$(SRC)/lib/libc/inc
       66 +DYNFLAGS +=     $(VERSREF) '-R$$ORIGIN'
       67 +LDLIBS +=       $(CONVLIBDIR) -lconv -lc
  70   68  
  71   69  BLTDEFS =       msg.h
  72   70  BLTDATA =       msg.c
  73   71  BLTMESG =       $(SGSMSGDIR)/liblddbg
  74   72  
  75   73  BLTFILES =      $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  76   74  
  77      -SGSMSGCOM =     ../common/liblddbg.msg
       75 +SGSMSGCOM =     $(SRCDIR)/common/liblddbg.msg
  78   76  SGSMSGALL =     $(SGSMSGCOM)
  79   77  SGSMSGTARG =    $(SGSMSGCOM)
  80   78  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n liblddbg_msg
  81   79  
  82      -CHKSRCS =       $(COMOBJS32:%32.o=../common/%.c)
       80 +CHKSRCS =       $(COMOBJS32:%32.o=$(SRCDIR)/common/%.c)
  83   81  
  84      -LIBSRCS =       $(COMOBJS:%.o=../common/%.c) \
  85      -                $(TOOLOBJ:%.o=$(SGSTOOLS)/common/%.c) $(BLTDATA)
       82 +LIBSRCS =       $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \
       83 +                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) $(BLTDATA)
  86   84  
  87   85  CLEANFILES +=   $(BLTFILES)
  88   86  CLOBBERFILES += $(DYNLIB) $(LIBLINKS)
  89   87  
  90   88  ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX