From 778876f6ce542fd3d6611d30ac474c9b26e15fa7 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 16 Jul 2002 15:30:32 +0000 Subject: [PATCH] 2002-07-16 Jeff Johnston * libc/Makefile.am (stmp-extra): New target to set makeinfo flag if LIBC_EXTRA_LIB is present. * libc/Makefile.in: Regenerated. * libc/libc.texinfo: Add blank line. * libc/argz/Makefile.am: Add doc support. * libc/search/Makefile.am: Ditto. * libc/argz/Makefile.in: Regenerated. * libc/search/Makefile.in: Ditto. * libc/misc/misc.tex: Add ffs function. * libc/stdio/ftell.c: Fix missing doc delimeter in description. --- newlib/ChangeLog | 13 +++++++++++++ newlib/libc/Makefile.am | 13 ++++++++++++- newlib/libc/Makefile.in | 13 ++++++++++++- newlib/libc/argz/Makefile.am | 16 ++++++++++++++++ newlib/libc/argz/Makefile.in | 19 ++++++++++++++++++- newlib/libc/libc.texinfo | 1 + newlib/libc/misc/misc.tex | 4 ++++ newlib/libc/search/Makefile.am | 16 ++++++++++++++++ newlib/libc/search/Makefile.in | 19 ++++++++++++++++++- newlib/libc/stdio/ftell.c | 2 +- 10 files changed, 111 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 8b1f822c7..68c910d1b 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,16 @@ +2002-07-16 Jeff Johnston + + * libc/Makefile.am (stmp-extra): New target to set makeinfo flag + if LIBC_EXTRA_LIB is present. + * libc/Makefile.in: Regenerated. + * libc/libc.texinfo: Add blank line. + * libc/argz/Makefile.am: Add doc support. + * libc/search/Makefile.am: Ditto. + * libc/argz/Makefile.in: Regenerated. + * libc/search/Makefile.in: Ditto. + * libc/misc/misc.tex: Add ffs function. + * libc/stdio/ftell.c: Fix missing doc delimeter in description. + 2002-07-15 Jeff Johnston * libc/include/sys/config.h[__H8300__]: Replace __SMALL_BITFIELDS diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 7a22c0269..7e8bdba1d 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -114,7 +114,7 @@ SUBDEFS = \ $(LIBC_EXTRA_DEF) \ misc/stmp-def -libc.info: sigset.texi targetdep.tex $(SUBDEFS) +libc.info: sigset.texi extra.texi targetdep.tex $(SUBDEFS) stmp-sigset: config.status if test -n "$(LIBC_SIGNAL_LIB)"; then \ @@ -127,6 +127,17 @@ stmp-sigset: config.status sigset.texi: stmp-sigset ; @true +stmp-extra: config.status + if test -n "$(LIBC_EXTRA_LIB)"; then \ + echo "@set EXTRA" >tmp.texi; \ + else \ + echo "@clear EXTRA" >tmp.texi; \ + fi + $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi + touch $@ + +extra.texi: stmp-extra ; @true + stmp-targetdep: force rm -f tmp.texi targetdoc=`pwd`/tmp.texi; \ diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index 7740cac94..4b2095aca 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -693,7 +693,7 @@ crt0.o: sys/crt0.o sys/crt0.o: ; @true -libc.info: sigset.texi targetdep.tex $(SUBDEFS) +libc.info: sigset.texi extra.texi targetdep.tex $(SUBDEFS) stmp-sigset: config.status if test -n "$(LIBC_SIGNAL_LIB)"; then \ @@ -706,6 +706,17 @@ stmp-sigset: config.status sigset.texi: stmp-sigset ; @true +stmp-extra: config.status + if test -n "$(LIBC_EXTRA_LIB)"; then \ + echo "@set EXTRA" >tmp.texi; \ + else \ + echo "@clear EXTRA" >tmp.texi; \ + fi + $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi + touch $@ + +extra.texi: stmp-extra ; @true + stmp-targetdep: force rm -f tmp.texi targetdoc=`pwd`/tmp.texi; \ diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am index a4c04283c..d0a290633 100644 --- a/newlib/libc/argz/Makefile.am +++ b/newlib/libc/argz/Makefile.am @@ -37,4 +37,20 @@ lib_a_SOURCES = $(LIB_SOURCES) noinst_DATA = endif # USE_LIBTOOL +SUFFIXES = .def + +CHEWOUT_FILES = + +CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str + +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC = ../tmp.texi + +doc: $(CHEWOUT_FILES) + +CLEANFILES = $(CHEWOUT_FILES) *.ref + include $(srcdir)/../../Makefile.shared diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in index f5c9d14de..69332c88c 100644 --- a/newlib/libc/argz/Makefile.in +++ b/newlib/libc/argz/Makefile.in @@ -138,6 +138,16 @@ libargz_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) + +SUFFIXES = .def + +CHEWOUT_FILES = + +CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str + +TARGETDOC = ../tmp.texi + +CLEANFILES = $(CHEWOUT_FILES) *.ref mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -186,7 +196,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libargz_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s +.SUFFIXES: .S .c .def .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared cd $(top_srcdir) && $(AUTOMAKE) --cygnus argz/Makefile @@ -340,6 +350,7 @@ installdirs: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -390,6 +401,12 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +doc: $(CHEWOUT_FILES) + objectlist.awk.in: $(noinst_LTLIBRARIES) -rm -f objectlist.awk.in for i in `ls *.lo` ; \ diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texinfo index b1ca8f9e7..250fd9ca2 100644 --- a/newlib/libc/libc.texinfo +++ b/newlib/libc/libc.texinfo @@ -165,6 +165,7 @@ into another language, under the above conditions for modified versions. * Timefns:: * Locale:: * Syscalls:: + * Misc:: * Arglists:: * Reentrancy:: diff --git a/newlib/libc/misc/misc.tex b/newlib/libc/misc/misc.tex index ea5599d83..22c313eb1 100644 --- a/newlib/libc/misc/misc.tex +++ b/newlib/libc/misc/misc.tex @@ -3,8 +3,12 @@ This chapter describes miscellaneous routines not covered elsewhere. @menu +* ffs:: Return first bit set in a word * unctrl:: Return printable representation of a character @end menu +@page +@include misc/ffs.def + @page @include misc/unctrl.def diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am index b888a9de1..2f919dcf7 100644 --- a/newlib/libc/search/Makefile.am +++ b/newlib/libc/search/Makefile.am @@ -37,4 +37,20 @@ lib_a_SOURCES = $(LIB_SOURCES) noinst_DATA = endif # USE_LIBTOOL +SUFFIXES = .def + +CHEWOUT_FILES = + +CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str + +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC = ../tmp.texi + +doc: $(CHEWOUT_FILES) + +CLEANFILES = $(CHEWOUT_FILES) *.ref + include $(srcdir)/../../Makefile.shared diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in index e4fb8d684..6d7c0c114 100644 --- a/newlib/libc/search/Makefile.in +++ b/newlib/libc/search/Makefile.in @@ -138,6 +138,16 @@ libsearch_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) + +SUFFIXES = .def + +CHEWOUT_FILES = + +CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str + +TARGETDOC = ../tmp.texi + +CLEANFILES = $(CHEWOUT_FILES) *.ref mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -180,7 +190,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libsearch_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s +.SUFFIXES: .S .c .def .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared cd $(top_srcdir) && $(AUTOMAKE) --cygnus search/Makefile @@ -334,6 +344,7 @@ installdirs: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -384,6 +395,12 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +doc: $(CHEWOUT_FILES) + objectlist.awk.in: $(noinst_LTLIBRARIES) -rm -f objectlist.awk.in for i in `ls *.lo` ; \ diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c index af17e248e..5cd3987c0 100644 --- a/newlib/libc/stdio/ftell.c +++ b/newlib/libc/stdio/ftell.c @@ -46,7 +46,7 @@ The result of <>/<> is the current position for a file identified by <[fp]>. If you record this result, you can later use it with <>/<> to return the file to this position. The difference between <> and <> is that -<> returns <> and < returns <>. +<> returns <> and <> returns <>. In the current implementation, <>/<> simply uses a character count to represent the file position; this is the same number that