public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] newlib: libc: reshuffle include order for the manual
@ 2022-02-18 1:45 Michael Frysinger
0 siblings, 0 replies; only message in thread
From: Michael Frysinger @ 2022-02-18 1:45 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c75bb30fc10bb68a087995ce7f4bf16fd8b0a4b0
commit c75bb30fc10bb68a087995ce7f4bf16fd8b0a4b0
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sun Feb 13 02:44:31 2022 -0500
newlib: libc: reshuffle include order for the manual
When migrating the manual to the top-level, the include order was
sorted by name of the subdir. But this changed the chapter order
of the manual in the process. Change the sorting back to match
existing chapters and update the comments to explain.
Diff:
---
newlib/Makefile.in | 181 +++++++++++++++++++-------------------
newlib/libc/Makefile.am | 4 +-
newlib/libc/Makefile.in | 5 +-
newlib/libc/Makefile.inc | 29 ++++--
newlib/libc/argz/Makefile.inc | 0
newlib/libc/errno/Makefile.inc | 0
newlib/libc/machine/Makefile.inc | 0
newlib/libc/sys/Makefile.inc | 0
newlib/libc/syscalls/Makefile.inc | 0
newlib/libc/unix/Makefile.inc | 0
newlib/libc/xdr/Makefile.inc | 0
11 files changed, 115 insertions(+), 104 deletions(-)
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index 5a83f8608..c952082bf 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -553,85 +553,8 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
# been flattening chapters into the main library dir (e.g. libc/) to avoid that.
@HAVE_DOC_TRUE@TEXI2DOCBOOK = $(top_srcdir)/doc/chapter-texi2docbook.py
libc_libc_TEXINFOS = libc/targetdep.tex $(LIBC_CHEWOUT_FILES)
-LIBC_CHEWOUT_FILES = libc/ctype/isalnum.def libc/ctype/isalpha.def \
- libc/ctype/isascii.def libc/ctype/isblank.def \
- libc/ctype/iscntrl.def libc/ctype/isdigit.def \
- libc/ctype/islower.def libc/ctype/isprint.def \
- libc/ctype/ispunct.def libc/ctype/isspace.def \
- libc/ctype/isupper.def libc/ctype/iswalnum.def \
- libc/ctype/iswalpha.def libc/ctype/iswblank.def \
- libc/ctype/iswcntrl.def libc/ctype/iswctype.def \
- libc/ctype/iswdigit.def libc/ctype/iswgraph.def \
- libc/ctype/iswlower.def libc/ctype/iswprint.def \
- libc/ctype/iswpunct.def libc/ctype/iswspace.def \
- libc/ctype/iswupper.def libc/ctype/iswxdigit.def \
- libc/ctype/isxdigit.def libc/ctype/toascii.def \
- libc/ctype/tolower.def libc/ctype/toupper.def \
- libc/ctype/towctrans.def libc/ctype/towlower.def \
- libc/ctype/towupper.def libc/ctype/wctrans.def \
- libc/ctype/wctype.def libc/iconv/lib/iconv.def \
- libc/locale/duplocale.def libc/locale/freelocale.def \
- libc/locale/locale.def libc/locale/newlocale.def \
- libc/locale/uselocale.def libc/misc/ffs.def libc/misc/lock.def \
- libc/misc/unctrl.def libc/posix/popen.def \
- libc/posix/posix_spawn.def libc/reent/closer.def \
- libc/reent/reent.def libc/reent/execr.def \
- libc/reent/fcntlr.def libc/reent/fstatr.def \
- libc/reent/gettimeofdayr.def libc/reent/linkr.def \
- libc/reent/lseekr.def libc/reent/mkdirr.def \
- libc/reent/openr.def libc/reent/readr.def \
- libc/reent/renamer.def libc/reent/signalr.def \
- libc/reent/sbrkr.def libc/reent/statr.def \
- libc/reent/timesr.def libc/reent/unlinkr.def \
- libc/reent/fstat64r.def libc/reent/lseek64r.def \
- libc/reent/stat64r.def libc/reent/open64r.def \
- libc/reent/writer.def libc/search/bsearch.def \
- libc/search/qsort.def libc/search/qsort_r.def \
- libc/signal/psignal.def libc/signal/raise.def \
- libc/signal/signal.def libc/signal/sig2str.def \
- libc/stdio64/fdopen64.def libc/stdio64/fgetpos64.def \
- libc/stdio64/fopen64.def libc/stdio64/freopen64.def \
- libc/stdio64/fseeko64.def libc/stdio64/fsetpos64.def \
- libc/stdio64/ftello64.def libc/stdio64/tmpfile64.def \
- libc/stdio/clearerr.def libc/stdio/diprintf.def \
- libc/stdio/dprintf.def libc/stdio/fcloseall.def \
- libc/stdio/fclose.def libc/stdio/fdopen.def \
- libc/stdio/feof.def libc/stdio/ferror.def \
- libc/stdio/fflush.def libc/stdio/fgetc.def \
- libc/stdio/fgetpos.def libc/stdio/fgets.def \
- libc/stdio/fgetwc.def libc/stdio/fgetws.def \
- libc/stdio/fileno.def libc/stdio/fmemopen.def \
- libc/stdio/fopen.def libc/stdio/fopencookie.def \
- libc/stdio/fpurge.def libc/stdio/fputc.def \
- libc/stdio/fputs.def libc/stdio/fputwc.def \
- libc/stdio/fputws.def libc/stdio/fread.def \
- libc/stdio/freopen.def libc/stdio/fseek.def \
- libc/stdio/fsetlocking.def libc/stdio/fsetpos.def \
- libc/stdio/ftell.def libc/stdio/funopen.def \
- libc/stdio/fwide.def libc/stdio/fwrite.def libc/stdio/getc.def \
- libc/stdio/getc_u.def libc/stdio/getchar.def \
- libc/stdio/getchar_u.def libc/stdio/getdelim.def \
- libc/stdio/getline.def libc/stdio/gets.def libc/stdio/getw.def \
- libc/stdio/getwchar.def libc/stdio/mktemp.def \
- libc/stdio/nano-vfprintf.def libc/stdio/nano-vfscanf.def \
- libc/stdio/open_memstream.def libc/stdio/perror.def \
- libc/stdio/putc.def libc/stdio/putc_u.def \
- libc/stdio/putchar.def libc/stdio/putchar_u.def \
- libc/stdio/puts.def libc/stdio/putw.def \
- libc/stdio/putwchar.def libc/stdio/remove.def \
- libc/stdio/rename.def libc/stdio/rewind.def \
- libc/stdio/setbuf.def libc/stdio/setbuffer.def \
- libc/stdio/setlinebuf.def libc/stdio/setvbuf.def \
- libc/stdio/siprintf.def libc/stdio/siscanf.def \
- libc/stdio/sprintf.def libc/stdio/sscanf.def \
- libc/stdio/stdio_ext.def libc/stdio/swprintf.def \
- libc/stdio/swscanf.def libc/stdio/tmpfile.def \
- libc/stdio/tmpnam.def libc/stdio/ungetc.def \
- libc/stdio/ungetwc.def libc/stdio/vfprintf.def \
- libc/stdio/vfscanf.def libc/stdio/vfwprintf.def \
- libc/stdio/vfwscanf.def libc/stdio/viprintf.def \
- libc/stdio/viscanf.def libc/stdlib/_Exit.def \
- libc/stdlib/a64l.def libc/stdlib/abort.def libc/stdlib/abs.def \
+LIBC_CHEWOUT_FILES = libc/stdlib/_Exit.def libc/stdlib/a64l.def \
+ libc/stdlib/abort.def libc/stdlib/abs.def \
libc/stdlib/assert.def libc/stdlib/atexit.def \
libc/stdlib/atof.def libc/stdlib/atoi.def \
libc/stdlib/atoll.def libc/stdlib/calloc.def \
@@ -653,7 +576,67 @@ LIBC_CHEWOUT_FILES = libc/ctype/isalnum.def libc/ctype/isalpha.def \
libc/stdlib/wcstol.def libc/stdlib/wcstoll.def \
libc/stdlib/wcstoul.def libc/stdlib/wcstoull.def \
libc/stdlib/system.def libc/stdlib/wcstombs.def \
- libc/stdlib/wctomb.def libc/string/bcmp.def \
+ libc/stdlib/wctomb.def libc/ctype/isalnum.def \
+ libc/ctype/isalpha.def libc/ctype/isascii.def \
+ libc/ctype/isblank.def libc/ctype/iscntrl.def \
+ libc/ctype/isdigit.def libc/ctype/islower.def \
+ libc/ctype/isprint.def libc/ctype/ispunct.def \
+ libc/ctype/isspace.def libc/ctype/isupper.def \
+ libc/ctype/iswalnum.def libc/ctype/iswalpha.def \
+ libc/ctype/iswblank.def libc/ctype/iswcntrl.def \
+ libc/ctype/iswctype.def libc/ctype/iswdigit.def \
+ libc/ctype/iswgraph.def libc/ctype/iswlower.def \
+ libc/ctype/iswprint.def libc/ctype/iswpunct.def \
+ libc/ctype/iswspace.def libc/ctype/iswupper.def \
+ libc/ctype/iswxdigit.def libc/ctype/isxdigit.def \
+ libc/ctype/toascii.def libc/ctype/tolower.def \
+ libc/ctype/toupper.def libc/ctype/towctrans.def \
+ libc/ctype/towlower.def libc/ctype/towupper.def \
+ libc/ctype/wctrans.def libc/ctype/wctype.def \
+ libc/search/bsearch.def libc/search/qsort.def \
+ libc/search/qsort_r.def libc/stdio/clearerr.def \
+ libc/stdio/diprintf.def libc/stdio/dprintf.def \
+ libc/stdio/fcloseall.def libc/stdio/fclose.def \
+ libc/stdio/fdopen.def libc/stdio/feof.def \
+ libc/stdio/ferror.def libc/stdio/fflush.def \
+ libc/stdio/fgetc.def libc/stdio/fgetpos.def \
+ libc/stdio/fgets.def libc/stdio/fgetwc.def \
+ libc/stdio/fgetws.def libc/stdio/fileno.def \
+ libc/stdio/fmemopen.def libc/stdio/fopen.def \
+ libc/stdio/fopencookie.def libc/stdio/fpurge.def \
+ libc/stdio/fputc.def libc/stdio/fputs.def \
+ libc/stdio/fputwc.def libc/stdio/fputws.def \
+ libc/stdio/fread.def libc/stdio/freopen.def \
+ libc/stdio/fseek.def libc/stdio/fsetlocking.def \
+ libc/stdio/fsetpos.def libc/stdio/ftell.def \
+ libc/stdio/funopen.def libc/stdio/fwide.def \
+ libc/stdio/fwrite.def libc/stdio/getc.def \
+ libc/stdio/getc_u.def libc/stdio/getchar.def \
+ libc/stdio/getchar_u.def libc/stdio/getdelim.def \
+ libc/stdio/getline.def libc/stdio/gets.def libc/stdio/getw.def \
+ libc/stdio/getwchar.def libc/stdio/mktemp.def \
+ libc/stdio/nano-vfprintf.def libc/stdio/nano-vfscanf.def \
+ libc/stdio/open_memstream.def libc/stdio/perror.def \
+ libc/stdio/putc.def libc/stdio/putc_u.def \
+ libc/stdio/putchar.def libc/stdio/putchar_u.def \
+ libc/stdio/puts.def libc/stdio/putw.def \
+ libc/stdio/putwchar.def libc/stdio/remove.def \
+ libc/stdio/rename.def libc/stdio/rewind.def \
+ libc/stdio/setbuf.def libc/stdio/setbuffer.def \
+ libc/stdio/setlinebuf.def libc/stdio/setvbuf.def \
+ libc/stdio/siprintf.def libc/stdio/siscanf.def \
+ libc/stdio/sprintf.def libc/stdio/sscanf.def \
+ libc/stdio/stdio_ext.def libc/stdio/swprintf.def \
+ libc/stdio/swscanf.def libc/stdio/tmpfile.def \
+ libc/stdio/tmpnam.def libc/stdio/ungetc.def \
+ libc/stdio/ungetwc.def libc/stdio/vfprintf.def \
+ libc/stdio/vfscanf.def libc/stdio/vfwprintf.def \
+ libc/stdio/vfwscanf.def libc/stdio/viprintf.def \
+ libc/stdio/viscanf.def libc/stdio64/fdopen64.def \
+ libc/stdio64/fgetpos64.def libc/stdio64/fopen64.def \
+ libc/stdio64/freopen64.def libc/stdio64/fseeko64.def \
+ libc/stdio64/fsetpos64.def libc/stdio64/ftello64.def \
+ libc/stdio64/tmpfile64.def libc/string/bcmp.def \
libc/string/memcpy.def libc/string/strcmp.def \
libc/string/strncat.def libc/string/strstr.def \
libc/string/bcopy.def libc/string/memmove.def \
@@ -696,18 +679,36 @@ LIBC_CHEWOUT_FILES = libc/ctype/isalnum.def libc/ctype/isalpha.def \
libc/string/wcscasecmp_l.def libc/string/wcscoll_l.def \
libc/string/wcsncasecmp_l.def libc/string/wcsxfrm_l.def \
libc/string/strverscmp.def libc/string/strnstr.def \
- libc/string/wmempcpy.def libc/time/asctime.def \
+ libc/string/wmempcpy.def libc/signal/psignal.def \
+ libc/signal/raise.def libc/signal/signal.def \
+ libc/signal/sig2str.def libc/time/asctime.def \
libc/time/clock.def libc/time/ctime.def libc/time/difftime.def \
libc/time/gmtime.def libc/time/lcltime.def \
libc/time/mktime.def libc/time/strftime.def libc/time/time.def \
libc/time/tzlock.def libc/time/tzset.def \
- libc/time/wcsftime.def
-LIBC_CHAPTERS = libc/sys.tex libc/ctype/ctype.tex libc/iconv/iconv.tex \
- libc/locale/locale.tex libc/misc/misc.tex libc/posix/posix.tex \
- libc/reent/reent.tex libc/signal/signal.tex libc/ssp/ssp.tex \
- libc/stdio64/stdio64.tex libc/stdio/stdio.tex \
- libc/stdlib/stdlib.tex libc/string/strings.tex \
- libc/string/wcstrings.tex libc/time/time.tex
+ libc/time/wcsftime.def libc/locale/duplocale.def \
+ libc/locale/freelocale.def libc/locale/locale.def \
+ libc/locale/newlocale.def libc/locale/uselocale.def \
+ libc/reent/closer.def libc/reent/reent.def \
+ libc/reent/execr.def libc/reent/fcntlr.def \
+ libc/reent/fstatr.def libc/reent/gettimeofdayr.def \
+ libc/reent/linkr.def libc/reent/lseekr.def \
+ libc/reent/mkdirr.def libc/reent/openr.def \
+ libc/reent/readr.def libc/reent/renamer.def \
+ libc/reent/signalr.def libc/reent/sbrkr.def \
+ libc/reent/statr.def libc/reent/timesr.def \
+ libc/reent/unlinkr.def libc/reent/fstat64r.def \
+ libc/reent/lseek64r.def libc/reent/stat64r.def \
+ libc/reent/open64r.def libc/reent/writer.def libc/misc/ffs.def \
+ libc/misc/lock.def libc/misc/unctrl.def libc/posix/popen.def \
+ libc/posix/posix_spawn.def libc/iconv/lib/iconv.def
+LIBC_CHAPTERS = libc/sys.tex libc/stdlib/stdlib.tex \
+ libc/ctype/ctype.tex libc/stdio/stdio.tex \
+ libc/stdio64/stdio64.tex libc/string/strings.tex \
+ libc/string/wcstrings.tex libc/signal/signal.tex \
+ libc/time/time.tex libc/locale/locale.tex libc/reent/reent.tex \
+ libc/misc/misc.tex libc/posix/posix.tex libc/iconv/iconv.tex \
+ libc/ssp/ssp.tex
LIBC_DOCBOOK_OUT_FILES = $(LIBC_CHEWOUT_FILES:.def=.xml)
libm_libm_TEXINFOS = libm/targetdep.tex $(LIBM_CHEWOUT_FILES)
LIBM_CHEWOUT_FILES = libm/common/s_cbrt.def libm/common/s_copysign.def \
@@ -752,7 +753,7 @@ all: newlib.h _newlib_version.h
.SUFFIXES: .def .xml .c .dvi .o .obj .ps
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libc/Makefile.inc $(srcdir)/libc/ctype/Makefile.inc $(srcdir)/libc/iconv/Makefile.inc $(srcdir)/libc/iconv/lib/Makefile.inc $(srcdir)/libc/locale/Makefile.inc $(srcdir)/libc/misc/Makefile.inc $(srcdir)/libc/posix/Makefile.inc $(srcdir)/libc/reent/Makefile.inc $(srcdir)/libc/search/Makefile.inc $(srcdir)/libc/signal/Makefile.inc $(srcdir)/libc/ssp/Makefile.inc $(srcdir)/libc/stdio64/Makefile.inc $(srcdir)/libc/stdio/Makefile.inc $(srcdir)/libc/stdlib/Makefile.inc $(srcdir)/libc/string/Makefile.inc $(srcdir)/libc/time/Makefile.inc $(srcdir)/libm/Makefile.inc $(srcdir)/libm/common/Makefile.inc $(srcdir)/libm/complex/Makefile.inc $(srcdir)/libm/fenv/Makefile.inc $(srcdir)/libm/mathfp/Makefile.inc $(srcdir)/libm/math/Makefile.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libc/Makefile.inc $(srcdir)/libc/argz/Makefile.inc $(srcdir)/libc/stdlib/Makefile.inc $(srcdir)/libc/ctype/Makefile.inc $(srcdir)/libc/search/Makefile.inc $(srcdir)/libc/stdio/Makefile.inc $(srcdir)/libc/stdio64/Makefile.inc $(srcdir)/libc/string/Makefile.inc $(srcdir)/libc/signal/Makefile.inc $(srcdir)/libc/time/Makefile.inc $(srcdir)/libc/locale/Makefile.inc $(srcdir)/libc/reent/Makefile.inc $(srcdir)/libc/errno/Makefile.inc $(srcdir)/libc/misc/Makefile.inc $(srcdir)/libc/unix/Makefile.inc $(srcdir)/libc/posix/Makefile.inc $(srcdir)/libc/syscalls/Makefile.inc $(srcdir)/libc/iconv/Makefile.inc $(srcdir)/libc/iconv/lib/Makefile.inc $(srcdir)/libc/xdr/Makefile.inc $(srcdir)/libc/ssp/Makefile.inc $(srcdir)/libc/sys/Makefile.inc $(srcdir)/libc/machine/Makefile.inc $(srcdir)/libm/Makefile.inc $(srcdir)/libm/common/Makefile.inc $(srcdir)/libm/complex/Makefile.inc $(srcdir)/libm/fenv/Makefile.inc $(srcdir)/libm/mathfp/Makefile.inc $(srcdir)/libm/math/Makefile.inc $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -774,7 +775,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libc/Makefile.inc $(srcdir)/libc/ctype/Makefile.inc $(srcdir)/libc/iconv/Makefile.inc $(srcdir)/libc/iconv/lib/Makefile.inc $(srcdir)/libc/locale/Makefile.inc $(srcdir)/libc/misc/Makefile.inc $(srcdir)/libc/posix/Makefile.inc $(srcdir)/libc/reent/Makefile.inc $(srcdir)/libc/search/Makefile.inc $(srcdir)/libc/signal/Makefile.inc $(srcdir)/libc/ssp/Makefile.inc $(srcdir)/libc/stdio64/Makefile.inc $(srcdir)/libc/stdio/Makefile.inc $(srcdir)/libc/stdlib/Makefile.inc $(srcdir)/libc/string/Makefile.inc $(srcdir)/libc/time/Makefile.inc $(srcdir)/libm/Makefile.inc $(srcdir)/libm/common/Makefile.inc $(srcdir)/libm/complex/Makefile.inc $(srcdir)/libm/fenv/Makefile.inc $(srcdir)/libm/mathfp/Makefile.inc $(srcdir)/libm/math/Makefile.inc $(am__empty):
+$(srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libc/Makefile.inc $(srcdir)/libc/argz/Makefile.inc $(srcdir)/libc/stdlib/Makefile.inc $(srcdir)/libc/ctype/Makefile.inc $(srcdir)/libc/search/Makefile.inc $(srcdir)/libc/stdio/Makefile.inc $(srcdir)/libc/stdio64/Makefile.inc $(srcdir)/libc/string/Makefile.inc $(srcdir)/libc/signal/Makefile.inc $(srcdir)/libc/time/Makefile.inc $(srcdir)/libc/locale/Makefile.inc $(srcdir)/libc/reent/Makefile.inc $(srcdir)/libc/errno/Makefile.inc $(srcdir)/libc/misc/Makefile.inc $(srcdir)/libc/unix/Makefile.inc $(srcdir)/libc/posix/Makefile.inc $(srcdir)/libc/syscalls/Makefile.inc $(srcdir)/libc/iconv/Makefile.inc $(srcdir)/libc/iconv/lib/Makefile.inc $(srcdir)/libc/xdr/Makefile.inc $(srcdir)/libc/ssp/Makefile.inc $(srcdir)/libc/sys/Makefile.inc $(srcdir)/libc/machine/Makefile.inc $(srcdir)/libm/Makefile.inc $(srcdir)/libm/common/Makefile.inc $(srcdir)/libm/complex/Makefile.inc $(srcdir)/libm/fenv/Makefile.inc $(srcdir)/libm/mathfp/Makefile.inc $(srcdir)/libm/math/Makefile.inc $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 4534ea4ee..60dcf8b2f 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -36,14 +36,14 @@ if HAVE_XDR_DIR
XDR_SUBDIR = xdr
endif
-# The order of SUBDIRS is important for the integrated documentation.
-# Do not change the order without considering the doc impact.
SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale reent \
errno misc $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
$(XDR_SUBDIR) ssp
if HAVE_SYS_DIR
SUBDIRS += $(SYS_DIR)
endif
+# NB: Machine dir must come last so it can override common objects when creating
+# libc.a below.
if HAVE_LIBC_MACHINE_DIR
SUBDIRS += $(LIBC_MACHINE_DIR)
endif
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index 214740e48..dab644726 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -90,6 +90,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@HAVE_SYS_DIR_TRUE@am__append_1 = $(SYS_DIR)
+# NB: Machine dir must come last so it can override common objects when creating
+# libc.a below.
@HAVE_LIBC_MACHINE_DIR_TRUE@am__append_2 = $(LIBC_MACHINE_DIR)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -323,9 +325,6 @@ top_srcdir = @top_srcdir@
@ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_LIBS =
@ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_LIBS = iconv/ces/lib.a iconv/ccs/lib.a iconv/lib/lib.a
@HAVE_XDR_DIR_TRUE@XDR_SUBDIR = xdr
-
-# The order of SUBDIRS is important for the integrated documentation.
-# Do not change the order without considering the doc impact.
# NB: This must come last to avoid parallel build issues with current lib.a
# accumulation logic.
SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) \
diff --git a/newlib/libc/Makefile.inc b/newlib/libc/Makefile.inc
index f30ced867..a26085883 100644
--- a/newlib/libc/Makefile.inc
+++ b/newlib/libc/Makefile.inc
@@ -34,20 +34,31 @@ man: %C%_man
$(INSTALL_DATA) %D%/*.3 $(DESTDIR)$(mandir)/man3/
install-man: %C%_install-man
+## The order of includes is important for two reasons:
+## * The integrated documentation (chapter ordering).
+## * Object overridding -- machine dir must come last.
+## Do not change the order without considering the doc impact.
+include %D%/argz/Makefile.inc
+include %D%/stdlib/Makefile.inc
include %D%/ctype/Makefile.inc
-include %D%/iconv/Makefile.inc
-include %D%/locale/Makefile.inc
-include %D%/misc/Makefile.inc
-include %D%/posix/Makefile.inc
-include %D%/reent/Makefile.inc
include %D%/search/Makefile.inc
-include %D%/signal/Makefile.inc
-include %D%/ssp/Makefile.inc
-include %D%/stdio64/Makefile.inc
include %D%/stdio/Makefile.inc
-include %D%/stdlib/Makefile.inc
+include %D%/stdio64/Makefile.inc
include %D%/string/Makefile.inc
+include %D%/signal/Makefile.inc
include %D%/time/Makefile.inc
+include %D%/locale/Makefile.inc
+include %D%/reent/Makefile.inc
+include %D%/errno/Makefile.inc
+include %D%/misc/Makefile.inc
+include %D%/unix/Makefile.inc
+include %D%/posix/Makefile.inc
+include %D%/syscalls/Makefile.inc
+include %D%/iconv/Makefile.inc
+include %D%/xdr/Makefile.inc
+include %D%/ssp/Makefile.inc
+include %D%/sys/Makefile.inc
+include %D%/machine/Makefile.inc
CLEANFILES += \
%D%/targetdep.tex \
diff --git a/newlib/libc/argz/Makefile.inc b/newlib/libc/argz/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/errno/Makefile.inc b/newlib/libc/errno/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/machine/Makefile.inc b/newlib/libc/machine/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/sys/Makefile.inc b/newlib/libc/sys/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/syscalls/Makefile.inc b/newlib/libc/syscalls/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/unix/Makefile.inc b/newlib/libc/unix/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
diff --git a/newlib/libc/xdr/Makefile.inc b/newlib/libc/xdr/Makefile.inc
new file mode 100644
index 000000000..e69de29bb
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-18 1:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-18 1:45 [newlib-cygwin] newlib: libc: reshuffle include order for the manual Michael Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).