Print this page
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

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 14 lines elided ↑ open up ↑
  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) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
       25 +# Copyright 2014 Garrett D'Amore <garrett@damore.org>
  25   26  #
  26   27  
  27   28  #
  28   29  # Makefile.master, global definitions for system source
  29   30  #
  30   31  ROOT=           /proto
  31   32  
  32   33  #
  33   34  # Adjunct root, containing an additional proto area to be used for headers
  34   35  # and libraries.
↓ open down ↓ 615 lines elided ↑ open up ↑
 650  651                          $(SRC)/common/mapfiles/gen/amd64_gcc_map.noexeglobs
 651  652  MAPFILE.NGB =           $(MAPFILE.NGB_$(MACH))
 652  653  
 653  654  #
 654  655  # A generic interface mapfile name, used by various dynamic objects to define
 655  656  # the interfaces and interposers the object must export.
 656  657  #
 657  658  MAPFILE.INT =           mapfile-intf
 658  659  
 659  660  #
 660      -# LDLIBS32 can be set in the environment to override the following assignment.
 661      -# LDLIBS64 can be set to override the assignment made in Makefile.master.64.
      661 +# LDLIBS32 and LDLIBS64 can be set in the environment to override the following
      662 +# assignments.
      663 +#
 662  664  # These environment settings make sure that no libraries are searched outside
 663  665  # of the local workspace proto area:
 664  666  #       LDLIBS32=-YP,$ROOT/lib:$ROOT/usr/lib
 665  667  #       LDLIBS64=-YP,$ROOT/lib/$MACH64:$ROOT/usr/lib/$MACH64
 666  668  #
 667  669  LDLIBS32 =      $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3)
 668  670  LDLIBS32 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib)
 669  671  LDLIBS.cmd =    $(LDLIBS32)
 670  672  LDLIBS.lib =    $(LDLIBS32)
      673 +
      674 +LDLIBS64 =      $(ENVLDLIBS1:%=%/$(MACH64)) \
      675 +                $(ENVLDLIBS2:%=%/$(MACH64)) \
      676 +                $(ENVLDLIBS3:%=%/$(MACH64))
      677 +LDLIBS64 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64))
      678 +
 671  679  #
 672  680  # Define compilation macros.
 673  681  #
 674  682  COMPILE.c=      $(CC) $(CFLAGS) $(CPPFLAGS) -c
 675  683  COMPILE64.c=    $(CC) $(CFLAGS64) $(CPPFLAGS) -c
 676  684  COMPILE.cc=     $(CCC) $(CCFLAGS) $(CPPFLAGS) -c
 677  685  COMPILE64.cc=   $(CCC) $(CCFLAGS64) $(CPPFLAGS) -c
 678  686  COMPILE.s=      $(AS) $(ASFLAGS) $(AS_CPPFLAGS)
 679  687  COMPILE64.s=    $(AS) $(ASFLAGS) $($(MACH64)_AS_XARCH) $(AS_CPPFLAGS)
 680  688  COMPILE.d=      $(DTRACE) -G -32
↓ open down ↓ 480 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX