--- old/usr/src/Makefile.master.64
          +++ new/usr/src/Makefile.master.64

   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 (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  24   24  # Copyright (c) 2014 Joyent, Inc.  All rights reserved.
  25   25  #
  26   26  
  27   27  # rebind basic build macros to 64-bit versions
  28   28  
  29   29  CFLAGS=         $(CFLAGS64)
  30   30  CCFLAGS=        $(CCFLAGS64)
  31   31  COPTFLAG=       $(COPTFLAG64)
  32   32  CCOPTFLAG=      $(CCOPTFLAG64)
  33   33  COMPILE.c=      $(COMPILE64.c)
  34   34  COMPILE.cc=     $(COMPILE64.cc)
  35   35  COMPILE.s=      $(COMPILE64.s)
  36   36  COMPILE.d=      $(COMPILE64.d)
  37   37  COMPILE.b=      $(COMPILE64.b)
  38   38  LINK.c=         $(LINK64.c)
  39   39  LINK.cc=        $(LINK64.cc)
  40   40  LINT.c=         $(LINT64.c)
  41   41  
  42   42  CTF_FLAGS=      $(CTF_FLAGS_64)
  43   43  
  44   44  OFFSETS_CREATE= $(OFFSETS_CREATE64)
  45   45  
  46   46  #
  47   47  # Moved these up to the top level here, so they can be overridden
  48   48  #
  49   49  LDLIBS.cmd =    $(LDLIBS64)
  50   50  LDLIBS.lib =    $(LDLIBS64)
  51   51  
  52   52  #
  53   53  # Override Makefile.master's settings of GCCLIBDIR
  54   54  #
  55   55  GCCLIBDIR=      $(GCCLIBDIR64)
  56   56  
  57   57  #
  58   58  # Override Makefile.master's settings of CC, CCC, AS and LINT
  59   59  #
  60   60  CC=             $($(MACH64)_CC)
  61   61  CCC=            $($(MACH64)_CCC)
  62   62  CPP=            $($(MACH64)_CPP)
  63   63  AS=             $($(MACH64)_AS)
  64   64  LD=             $($(MACH64)_LD)
  65   65  LINT=           $($(MACH64)_LINT)
  66   66  
  67   67  REAL_CC=        $(CW_CC_CMD:sh)
  68   68  REAL_CCC=       $(CW_CCC_CMD:sh)
  69   69  
  70   70  BUILD.SO=       $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
  71   71                  $(PICS) $(EXTPICS) $(USDT_PICS) -L $(ROOTLIBDIR64) $(LDLIBS)
  72   72  
  73   73  #
  74   74  # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile
  75   75  #
  76   76  MAPFILECLASS=   -64
  77   77  
  78   78  CCNEEDED =              -lCrun
  79   79  $(__GNUC64)CCNEEDED =   -L$(GCCLIBDIR) -lstdc++
  80   80  $(__GNUC64)CCNEEDED +=  -lgcc_s
  81   81  
  82   82  BUILDCCC.SO=    $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
  83   83                  $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED)
  84   84  MAPFILE.NGB =   $(MAPFILE.NGB_$(MACH64))

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX