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

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2012 by Delphix. All rights reserved.
+ # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  #
  
  #
  # Makefile.master, global definitions for system source
  #
*** 655,675 ****
  # the interfaces and interposers the object must export.
  #
  MAPFILE.INT =           mapfile-intf
  
  #
! # LDLIBS32 can be set in the environment to override the following assignment.
! # LDLIBS64 can be set to override the assignment made in Makefile.master.64.
  # These environment settings make sure that no libraries are searched outside
  # of the local workspace proto area:
  #       LDLIBS32=-YP,$ROOT/lib:$ROOT/usr/lib
  #       LDLIBS64=-YP,$ROOT/lib/$MACH64:$ROOT/usr/lib/$MACH64
  #
  LDLIBS32 =      $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3)
  LDLIBS32 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib)
  LDLIBS.cmd =    $(LDLIBS32)
  LDLIBS.lib =    $(LDLIBS32)
  #
  # Define compilation macros.
  #
  COMPILE.c=      $(CC) $(CFLAGS) $(CPPFLAGS) -c
  COMPILE64.c=    $(CC) $(CFLAGS64) $(CPPFLAGS) -c
--- 656,683 ----
  # the interfaces and interposers the object must export.
  #
  MAPFILE.INT =           mapfile-intf
  
  #
! # LDLIBS32 and LDLIBS64 can be set in the environment to override the following
! # assignments.
! #
  # These environment settings make sure that no libraries are searched outside
  # of the local workspace proto area:
  #       LDLIBS32=-YP,$ROOT/lib:$ROOT/usr/lib
  #       LDLIBS64=-YP,$ROOT/lib/$MACH64:$ROOT/usr/lib/$MACH64
  #
  LDLIBS32 =      $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3)
  LDLIBS32 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib)
  LDLIBS.cmd =    $(LDLIBS32)
  LDLIBS.lib =    $(LDLIBS32)
+ 
+ LDLIBS64 =      $(ENVLDLIBS1:%=%/$(MACH64)) \
+                 $(ENVLDLIBS2:%=%/$(MACH64)) \
+                 $(ENVLDLIBS3:%=%/$(MACH64))
+ LDLIBS64 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64))
+ 
  #
  # Define compilation macros.
  #
  COMPILE.c=      $(CC) $(CFLAGS) $(CPPFLAGS) -c
  COMPILE64.c=    $(CC) $(CFLAGS64) $(CPPFLAGS) -c