newlib: merge acconfig.h changes into newlib.hin

The acconfig.h header was used to run autoheader and then manually
sync the output into newlib.hin.  Based on how the files have fallen
out of sync (with newlib.hin having many more templates), this has
not been run in a long time, and attempts to do so now would break
newlib.hin.

Further, if you try to run autoheader now, it will automatically
replace _newlib_version.hin since it's the first entry in the call
to AC_CONFIG_HEADERS.

So let's throw away acconfig.h entirely.  It only had 2 slightly
better comments, and the rest were either worse, missing, or stale.
This has the side benefit of avoiding autoheader warning about the
deprecated use of acconfig.h since newer autoconf only wants macro
calls in configure.ac.

diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index 636c835ce68755e146b8b8eb3e12ea093e34c7ac..1af918059b2fbd9205333ac3889baf73358283af 100644 (file)
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -591,7 +591,7 @@ _newlib_version.h: stamp-h1
 stamp-h1: $(srcdir)/_newlib_version.hin $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status _newlib_version.h
-$(srcdir)/_newlib_version.hin: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
+$(srcdir)/_newlib_version.hin: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
        rm -f stamp-h1
        touch $@

diff --git a/newlib/acconfig.h b/newlib/acconfig.h
deleted file mode 100644 (file)
index c28f7d6..0000000
--- a/newlib/acconfig.h
+++ /dev/null
@@ -1,191 +0,0 @@
-#ifndef __NEWLIB_H__
-
-#define __NEWLIB_H__ 1
-@TOP@
-
-/* EL/IX level */
-#undef _ELIX_LEVEL
-
-/* Newlib version */
-#undef _NEWLIB_VERSION
-
-/* C99 formats support (such as %a, %zu, ...) in IO functions like
- * printf/scanf enabled */
-#undef _WANT_IO_C99_FORMATS
-
-/* long long type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_LONG
-
-/* long double type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_DOUBLE
-
-/* Positional argument support in printf functions enabled.  */
-#undef _WANT_IO_POS_ARGS
-
-/* Optional reentrant struct support.  Used mostly on platforms with
-   very restricted storage.  */
-#undef _WANT_REENT_SMALL
-
-/* Verify _REENT_CHECK macros allocate memory successfully. */
-#undef _REENT_CHECK_VERIFY
-
-/* Multibyte supported */
-#undef _MB_CAPABLE
-
-/* MB_LEN_MAX */
-#undef _MB_LEN_MAX
-
-/* ICONV enabled */
-#undef _ICONV_ENABLED
-
-/* Enable ICONV external CCS files loading capabilities */
-#undef _ICONV_ENABLE_EXTERNAL_CCS
-
-/* Define if the linker supports .preinit_array/.init_array/.fini_array
- * sections.  */
-#undef  HAVE_INITFINI_ARRAY
-
-/* True if atexit() may dynamically allocate space for cleanup
-   functions.  */
-#undef  _ATEXIT_DYNAMIC_ALLOC
-
-/* Define if the compiler supports aliasing an array to an address.  */
-#undef  _HAVE_ARRAY_ALIASING
-
-/* Define if the platform supports long double type.  */
-#undef  _HAVE_LONG_DOUBLE
-
-/* Define if compiler supports -fno-tree-loop-distribute-patterns. */
-#undef  _HAVE_CC_INHIBIT_LOOP_TO_LIBCALL
-
-/* Define if the platform long double type is equal to double.  */
-#undef  _LDBL_EQ_DBL
- 
-/* Define if ivo supported in streamio.  */
-#undef _FVWRITE_IN_STREAMIO
-
-/* Define if fseek functions support seek optimization.  */
-#undef _FSEEK_OPTIMIZATION
-
-/* Define if wide char orientation is supported.  */
-#undef  _WIDE_ORIENT
-
-/* Define if unbuffered stream file optimization is supported.  */
-#undef _UNBUF_STREAM_OPT
-
-/* Define if enable lite version of exit.  */
-#undef _LITE_EXIT
-
-/* Define if nano version formatted IO is used.  */
-#undef _NANO_FORMATTED_IO
-
-@BOTTOM@
-/*
- * Iconv encodings enabled ("to" direction)
- */
-#undef _ICONV_TO_ENCODING_BIG5
-#undef _ICONV_TO_ENCODING_CP775
-#undef _ICONV_TO_ENCODING_CP850
-#undef _ICONV_TO_ENCODING_CP852
-#undef _ICONV_TO_ENCODING_CP855
-#undef _ICONV_TO_ENCODING_CP866
-#undef _ICONV_TO_ENCODING_EUC_JP
-#undef _ICONV_TO_ENCODING_EUC_TW
-#undef _ICONV_TO_ENCODING_EUC_KR
-#undef _ICONV_TO_ENCODING_ISO_8859_1
-#undef _ICONV_TO_ENCODING_ISO_8859_10
-#undef _ICONV_TO_ENCODING_ISO_8859_11
-#undef _ICONV_TO_ENCODING_ISO_8859_13
-#undef _ICONV_TO_ENCODING_ISO_8859_14
-#undef _ICONV_TO_ENCODING_ISO_8859_15
-#undef _ICONV_TO_ENCODING_ISO_8859_2
-#undef _ICONV_TO_ENCODING_ISO_8859_3
-#undef _ICONV_TO_ENCODING_ISO_8859_4
-#undef _ICONV_TO_ENCODING_ISO_8859_5
-#undef _ICONV_TO_ENCODING_ISO_8859_6
-#undef _ICONV_TO_ENCODING_ISO_8859_7
-#undef _ICONV_TO_ENCODING_ISO_8859_8
-#undef _ICONV_TO_ENCODING_ISO_8859_9
-#undef _ICONV_TO_ENCODING_ISO_IR_111
-#undef _ICONV_TO_ENCODING_KOI8_R
-#undef _ICONV_TO_ENCODING_KOI8_RU
-#undef _ICONV_TO_ENCODING_KOI8_U
-#undef _ICONV_TO_ENCODING_KOI8_UNI
-#undef _ICONV_TO_ENCODING_UCS_2
-#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_2BE
-#undef _ICONV_TO_ENCODING_UCS_2LE
-#undef _ICONV_TO_ENCODING_UCS_4
-#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_4BE
-#undef _ICONV_TO_ENCODING_UCS_4LE
-#undef _ICONV_TO_ENCODING_US_ASCII
-#undef _ICONV_TO_ENCODING_UTF_16
-#undef _ICONV_TO_ENCODING_UTF_16BE
-#undef _ICONV_TO_ENCODING_UTF_16LE
-#undef _ICONV_TO_ENCODING_UTF_8
-#undef _ICONV_TO_ENCODING_WIN_1250
-#undef _ICONV_TO_ENCODING_WIN_1251
-#undef _ICONV_TO_ENCODING_WIN_1252
-#undef _ICONV_TO_ENCODING_WIN_1253
-#undef _ICONV_TO_ENCODING_WIN_1254
-#undef _ICONV_TO_ENCODING_WIN_1255
-#undef _ICONV_TO_ENCODING_WIN_1256
-#undef _ICONV_TO_ENCODING_WIN_1257
-#undef _ICONV_TO_ENCODING_WIN_1258
-
-/*
- * Iconv encodings enabled ("from" direction)
- */
-#undef _ICONV_FROM_ENCODING_BIG5
-#undef _ICONV_FROM_ENCODING_CP775
-#undef _ICONV_FROM_ENCODING_CP850
-#undef _ICONV_FROM_ENCODING_CP852
-#undef _ICONV_FROM_ENCODING_CP855
-#undef _ICONV_FROM_ENCODING_CP866
-#undef _ICONV_FROM_ENCODING_EUC_JP
-#undef _ICONV_FROM_ENCODING_EUC_TW
-#undef _ICONV_FROM_ENCODING_EUC_KR
-#undef _ICONV_FROM_ENCODING_ISO_8859_1
-#undef _ICONV_FROM_ENCODING_ISO_8859_10
-#undef _ICONV_FROM_ENCODING_ISO_8859_11
-#undef _ICONV_FROM_ENCODING_ISO_8859_13
-#undef _ICONV_FROM_ENCODING_ISO_8859_14
-#undef _ICONV_FROM_ENCODING_ISO_8859_15
-#undef _ICONV_FROM_ENCODING_ISO_8859_2
-#undef _ICONV_FROM_ENCODING_ISO_8859_3
-#undef _ICONV_FROM_ENCODING_ISO_8859_4
-#undef _ICONV_FROM_ENCODING_ISO_8859_5
-#undef _ICONV_FROM_ENCODING_ISO_8859_6
-#undef _ICONV_FROM_ENCODING_ISO_8859_7
-#undef _ICONV_FROM_ENCODING_ISO_8859_8
-#undef _ICONV_FROM_ENCODING_ISO_8859_9
-#undef _ICONV_FROM_ENCODING_ISO_IR_111
-#undef _ICONV_FROM_ENCODING_KOI8_R
-#undef _ICONV_FROM_ENCODING_KOI8_RU
-#undef _ICONV_FROM_ENCODING_KOI8_U
-#undef _ICONV_FROM_ENCODING_KOI8_UNI
-#undef _ICONV_FROM_ENCODING_UCS_2
-#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_2BE
-#undef _ICONV_FROM_ENCODING_UCS_2LE
-#undef _ICONV_FROM_ENCODING_UCS_4
-#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_4BE
-#undef _ICONV_FROM_ENCODING_UCS_4LE
-#undef _ICONV_FROM_ENCODING_US_ASCII
-#undef _ICONV_FROM_ENCODING_UTF_16
-#undef _ICONV_FROM_ENCODING_UTF_16BE
-#undef _ICONV_FROM_ENCODING_UTF_16LE
-#undef _ICONV_FROM_ENCODING_UTF_8
-#undef _ICONV_FROM_ENCODING_WIN_1250
-#undef _ICONV_FROM_ENCODING_WIN_1251
-#undef _ICONV_FROM_ENCODING_WIN_1252
-#undef _ICONV_FROM_ENCODING_WIN_1253
-#undef _ICONV_FROM_ENCODING_WIN_1254
-#undef _ICONV_FROM_ENCODING_WIN_1255
-#undef _ICONV_FROM_ENCODING_WIN_1256
-#undef _ICONV_FROM_ENCODING_WIN_1257
-#undef _ICONV_FROM_ENCODING_WIN_1258
-
-#endif /* !__NEWLIB_H__ */

diff --git a/newlib/newlib.hin b/newlib/newlib.hin
index 37ed88e9784c3af1813597296986fadfd545da0d..db344649204f0172b004eb0b8d8c7b1623d5d3be 100644 (file)
--- a/newlib/newlib.hin
+++ b/newlib/newlib.hin
@@ -55,13 +55,13 @@
    functions.  */
 #undef  _ATEXIT_DYNAMIC_ALLOC
 
-/* True if long double supported.  */
+/* Define if the platform supports long double type.  */
 #undef  _HAVE_LONG_DOUBLE
 
 /* Define if compiler supports -fno-tree-loop-distribute-patterns. */
 #undef  _HAVE_CC_INHIBIT_LOOP_TO_LIBCALL
 
-/* True if long double supported and it is equal to double.  */
+/* Define if the platform long double type is equal to double.  */
 #undef  _LDBL_EQ_DBL
  
 /* Define if ivo supported in streamio.  */