4964 nl_langinfo(CRNCYSTR) returns wrong alignment character
4999 libc test suite enhancements
4939 desire wcsnrtombs() function
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: TBD

          --- 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 +# Copyright 2014 Garrett D'Amore <garrett@damore.org>
  23   24  #
  24   25  
  25   26  # rebind basic build macros to 64-bit versions
  26   27  
  27   28  CFLAGS=         $(CFLAGS64)
  28   29  CCFLAGS=        $(CCFLAGS64)
  29   30  COPTFLAG=       $(COPTFLAG64)
  30   31  CCOPTFLAG=      $(CCOPTFLAG64)
  31   32  COMPILE.c=      $(COMPILE64.c)
  32   33  COMPILE.cc=     $(COMPILE64.cc)

  33   34  COMPILE.s=      $(COMPILE64.s)
  34   35  COMPILE.d=      $(COMPILE64.d)

  35   36  COMPILE.b=      $(COMPILE64.b)
  36   37  LINK.c=         $(LINK64.c)
  37   38  LINK.cc=        $(LINK64.cc)
  38   39  LINT.c=         $(LINT64.c)
  39   40  
  40   41  CTF_FLAGS=      $(CTF_FLAGS_64)
  41   42  
  42   43  OFFSETS_CREATE= $(OFFSETS_CREATE64)
  43   44  
  44   45  #
  45      -# Some library path hackery, to allow building of partial workspaces
  46      -# and properly set the 64-bit library paths with 'ws'
  47      -#
  48      -LDLIBS1=        $(ENVLDLIBS1:%=%/$(MACH64))
  49      -LDLIBS2=        $(ENVLDLIBS2:%=%/$(MACH64))
  50      -LDLIBS3=        $(ENVLDLIBS3:%=%/$(MACH64))
  51      -LDLIBS64 =      $(LDLIBS1) $(LDLIBS2) $(LDLIBS3)
  52      -LDLIBS64 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64))
  53      -#
  54   46  # Moved these up to the top level here, so they can be overridden
  55   47  #
  56   48  LDLIBS.cmd =    $(LDLIBS64)
  57   49  LDLIBS.lib =    $(LDLIBS64)
  58   50  
  59   51  #
  60   52  # Override Makefile.master's settings of SFWLIBDIR and GCCLIBDIR
  61   53  #
  62   54  SFWLIBDIR=      $(SFWLIBDIR64)
  63   55  GCCLIBDIR=      $(GCCLIBDIR64)

  64   56  
  65   57  #
  66   58  # Override Makefile.master's settings of CC, CCC, AS and LINT
  67   59  #
  68   60  CC=             $($(MACH64)_CC)
  69   61  CCC=            $($(MACH64)_CCC)
  70   62  CPP=            $($(MACH64)_CPP)
  71   63  AS=             $($(MACH64)_AS)
  72   64  LD=             $($(MACH64)_LD)
  73   65  LINT=           $($(MACH64)_LINT)
  74   66  
  75   67  REAL_CC=        $(CW_CC_CMD:sh)
  76   68  REAL_CCC=       $(CW_CCC_CMD:sh)
  77   69  
  78   70  BUILD.SO=       $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
  79   71                  $(PICS) $(EXTPICS) -L $(ROOTLIBDIR64) $(LDLIBS)
  80   72  
  81   73  #
  82   74  # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile
  83   75  #
  84   76  MAPFILECLASS=   -64
  85   77  
  86   78  CCNEEDED =              -lCrun
  87   79  $(__GNUC64)CCNEEDED =   -L$(GCCLIBDIR) -lstdc++
  88   80  $(__GNUC64)CCNEEDED +=  -lgcc_s
  89   81  
  90   82  BUILDCCC.SO=    $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
  91   83                  $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED)
  92   84  MAPFILE.NGB =   $(MAPFILE.NGB_$(MACH64))

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX