Mercurial > illumos > illumos-gate

changeset 13154:f0f9062bed1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
59 sparc build broken
author Garrett D'Amore <gdamore@>
date Sat, 21 Aug 2010 07:48:34 +1000
parents 65c0e0c573e1
children f6c814f505e4
files usr/src/lib/libc/sparc/Makefile.com usr/src/lib/libc/sparcv9/Makefile.com
diffstat 2 files changed, 8 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/libc/sparc/Makefile.com	Thu Aug 19 21:42:46 2010 -0700
+++ b/usr/src/lib/libc/sparc/Makefile.com	Sat Aug 21 07:48:34 2010 +1000
@@ -789,6 +789,7 @@
 	fnmatch.o		\
 	fgetwc.o		\
 	fgetws.o		\
+	fix_grouping.o		\
 	fputwc.o		\
 	fputws.o		\
 	fwide.o			\
@@ -807,6 +808,7 @@
 	mbrlen.o		\
 	mbrtowc.o		\
 	mbsinit.o		\
+	mbsnrtowcs.o		\
 	mbsrtowcs.o		\
 	mbstowcs.o		\
 	mbtowc.o		\
@@ -836,9 +838,10 @@
 	wcrtomb.o		\
 	wcscoll.o		\
 	wcsftime.o		\
+	wcsnrtombs.o		\
 	wcsrtombs.o		\
+	wcstombs.o		\
 	wcswidth.o		\
-	wcstombs.o		\
 	wcsxfrm.o		\
 	wctob.o			\
 	wctomb.o		\
@@ -1035,12 +1038,6 @@
 # include common library definitions
 include $(SRC)/lib/Makefile.lib
 
-# NOTE: libc_i18n.a will be part of libc.so.1.  Therefore, the compilation
-# conditions such as the settings of CFLAGS and CPPFLAGS for the libc_i18n stuff
-# need to be compatible with the ones for the libc stuff.  Whenever the changes
-# that affect the compilation conditions of libc happened, those for libc_i18n
-# also need to be updated.
-
 # we need to override the default SONAME here because we might
 # be building a variant object (still libc.so.1, but different filename)
 SONAME = libc.so.1
@@ -1062,7 +1059,6 @@
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers
--- a/usr/src/lib/libc/sparcv9/Makefile.com	Thu Aug 19 21:42:46 2010 -0700
+++ b/usr/src/lib/libc/sparcv9/Makefile.com	Sat Aug 21 07:48:34 2010 +1000
@@ -738,6 +738,7 @@
 	fnmatch.o		\
 	fgetwc.o		\
 	fgetws.o		\
+	fix_grouping.o		\
 	fputwc.o		\
 	fputws.o		\
 	fwide.o			\
@@ -756,6 +757,7 @@
 	mbrlen.o		\
 	mbrtowc.o		\
 	mbsinit.o		\
+	mbsnrtowcs.o		\
 	mbsrtowcs.o		\
 	mbstowcs.o		\
 	mbtowc.o		\
@@ -785,9 +787,10 @@
 	wcrtomb.o		\
 	wcscoll.o		\
 	wcsftime.o		\
+	wcsnrtombs.o		\
 	wcsrtombs.o		\
+	wcstombs.o		\
 	wcswidth.o		\
-	wcstombs.o		\
 	wcsxfrm.o		\
 	wctob.o			\
 	wctomb.o		\
@@ -982,12 +985,6 @@
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/lib/Makefile.lib.64
 
-# NOTE: libc_i18n.a will be part of libc.so.1.  Therefore, the compilation
-# conditions such as the settings of CFLAGS and CPPFLAGS for the libc_i18n stuff
-# need to be compatible with the ones for the libc stuff.  Whenever the changes
-# that affect the compilation conditions of libc happened, those for libc_i18n
-# also need to be updated.
-
 # we need to override the default SONAME here because we might
 # be building a variant object (still libc.so.1, but different filename)
 SONAME = libc.so.1
@@ -1009,7 +1006,6 @@
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers