From c386ddb4d8a1b076d94ebe8b85ca5d0dd124892b Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Fri, 22 Nov 2002 03:05:27 +0000 Subject: Ok... here's the summary: Hopefully locale support will build when cross compiling now. Collation is still not supported, but that's what I'm currently working on. In the next couple of days, I'll probably put up a couple of files for download that will save people the trouble of generating all the glibc locales. Added *wprintf functions, although they currently don't support floating point. That will be fixed when I rewrite _dtostr... or possibly before. Added the wcsto{inttype} functions. Added iconv() and a mini iconv utility. The require locale support and only provide for conversions involving the various unicode encodings { UCS-4*, UCS-2*, UTF-32*, UTF-16*, UTF-8 }, the 8-bit codesets built with the locale data, and the internal WCHAR_T. --- libc/misc/wchar/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libc/misc/wchar/Makefile') diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile index 7ac27b6ea..acc852195 100644 --- a/libc/misc/wchar/Makefile +++ b/libc/misc/wchar/Makefile @@ -23,12 +23,17 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak +TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc MSRC1= wchar.c MOBJ1= btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \ wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \ __mbsnrtowcs.o __wcsnrtombs.o wcwidth.o wcswidth.o +ifeq ($(UCLIBC_HAS_LOCALE),y) + MOBJ1 += iconv.o +endif + MSRC2= wstdio.c MOBJ2= fwide.o \ fgetwc.o getwchar.o fgetws.o \ @@ -37,10 +42,6 @@ MOBJ2= fwide.o \ # getwc (fgetwc alias) getwc_unlocked (fgetwc_unlocked alias) # putwc (fputwc alias) putwc_unlocked (fputwc_unlocked alias) -# wcwidth wcswidth -# wcstod wcstof wcstold -# wcstol wcstoul wcstoq wcstouq wcstoll wcstoull -# fwprintf wprintf swprintf vfwprintf vwprintf vswprintf # fwscanf wscanf swscanf vfwscanf vwscanf vswscanf # wcsftime @@ -61,6 +62,10 @@ $(MOBJ2): $(MSRC2) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o $(STRIPTOOL) -x -R .note -R .comment $*.o +iconv.target: wchar.c + $(TARGET_CC) $(CFLAGS) -DL_iconv_main wchar.c -o $@ + $(STRIPTOOL) -x -R .note -R .comment $@ + clean: - rm -f *.[oa] *~ core + rm -f *.[oa] *~ core iconv.target -- cgit v1.2.3