2007-01-31 Kazunori Asayama <asayama@sm.sony.co.jp>

	* configure.host: Define stdio directory as a variable.
	* libc/Makefile.am: Define stdio related names
	as macros.
	* libc/configure.in: Add detection routine of stdio directory.
	* libc/Makefile.in: Regenerated.
	* libc/configure: Ditto.
	* libc/argz/Makefile.in: Ditto.
	* libc/ctype/Makefile.in: Ditto.
	* libc/errno/Makefile.in: Ditto.
	* libc/iconv/Makefile.in: Ditto.
	* libc/iconv/ccs/Makefile.in: Ditto.
	* libc/iconv/ccs/binary/Makefile.in: Ditto.
	* libc/iconv/ces/Makefile.in: Ditto.
	* libc/iconv/lib/Makefile.in: Ditto.
	* libc/locale/Makefile.in: Ditto.
	* libc/misc/Makefile.in: Ditto.
	* libc/posix/Makefile.in: Ditto.
	* libc/reent/Makefile.in: Ditto.
	* libc/search/Makefile.in: Ditto.
	* libc/signal/Makefile.in: Ditto.
	* libc/stdio/Makefile.in: Ditto.
	* libc/stdio64/Makefile.in: Ditto.
	* libc/stdlib/Makefile.in: Ditto.
	* libc/string/Makefile.in: Ditto.
	* libc/syscalls/Makefile.in: Ditto.
	* libc/time/Makefile.in: Ditto.
	* libc/unix/Makefile.in: Ditto.

25 files changed, 152 insertions, 11 deletions

diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 69d2bce36..d4311142a 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -18,6 +18,10 @@ if HAVE_UNIX_DIR
 UNIX_SUBDIR = unix
 endif
 
+if HAVE_STDIO_DIR
+STDIO_SUBDIR = stdio
+endif
+
 if HAVE_STDIO64_DIR
 STDIO64_SUBDIR = stdio64
 endif
@@ -32,7 +36,7 @@ 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 $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
+SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
 	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) .
 
 noinst_DATA = $(CRT0)
@@ -44,7 +48,7 @@ SUBLIBS = \
 	stdlib/libstdlib.$(aext) \
 	ctype/libctype.$(aext) \
 	search/libsearch.$(aext) \
-	stdio/libstdio.$(aext) \
+	$(LIBC_STDIO_LIB) \
 	$(LIBC_STDIO64_LIB) \
 	string/libstring.$(aext) \
 	$(LIBC_SIGNAL_LIB) \
@@ -66,7 +70,7 @@ SUBLIBS = \
 	stdlib/lib.$(aext) \
 	ctype/lib.$(aext) \
 	search/lib.$(aext) \
-	stdio/lib.$(aext) \
+	$(LIBC_STDIO_LIB) \
 	$(LIBC_STDIO64_LIB) \
 	string/lib.$(aext) \
 	$(LIBC_SIGNAL_LIB) \
@@ -119,7 +123,7 @@ sys/crt0.o: ; @true
 SUBDEFS = \
 	stdlib/stmp-def \
 	ctype/stmp-def \
-	stdio/stmp-def \
+	$(LIBC_STDIO_DEF) \
 	$(LIBC_STDIO64_DEF) \
 	string/stmp-def \
 	$(LIBC_SIGNAL_DEF) \
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index 58c8ae3c1..71fd3c12b 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -67,7 +67,7 @@ am__DEPENDENCIES_1 =
 @ENABLE_NEWLIB_ICONV_TRUE@	iconv/lib/lib.$(aext)
 @USE_LIBTOOL_FALSE@am__DEPENDENCIES_3 = argz/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	stdlib/lib.$(aext) ctype/lib.$(aext) \
-@USE_LIBTOOL_FALSE@	search/lib.$(aext) stdio/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	search/lib.$(aext) $(am__DEPENDENCIES_1) \
 @USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) string/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) time/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	locale/lib.$(aext) reent/lib.$(aext) \
@@ -80,7 +80,7 @@ am__DEPENDENCIES_1 =
 @USE_LIBTOOL_TRUE@	stdlib/libstdlib.$(aext) \
 @USE_LIBTOOL_TRUE@	ctype/libctype.$(aext) \
 @USE_LIBTOOL_TRUE@	search/libsearch.$(aext) \
-@USE_LIBTOOL_TRUE@	stdio/libstdio.$(aext) $(am__DEPENDENCIES_1) \
+@USE_LIBTOOL_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 @USE_LIBTOOL_TRUE@	string/libstring.$(aext) \
 @USE_LIBTOOL_TRUE@	$(am__DEPENDENCIES_1) time/libtime.$(aext) \
 @USE_LIBTOOL_TRUE@	locale/liblocale.$(aext) \
@@ -175,6 +175,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -192,6 +194,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -278,6 +282,7 @@ AUTOMAKE_OPTIONS = cygnus
 @HAVE_SIGNAL_DIR_TRUE@SIGNAL_SUBDIR = signal
 @HAVE_SYSCALL_DIR_TRUE@SYSCALLS_SUBDIR = syscalls
 @HAVE_UNIX_DIR_TRUE@UNIX_SUBDIR = unix
+@HAVE_STDIO_DIR_TRUE@STDIO_SUBDIR = stdio
 @HAVE_STDIO64_DIR_TRUE@STDIO64_SUBDIR = stdio64
 @ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_DIRS = 
 @ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_DIRS = iconv
@@ -286,7 +291,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 # 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 $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
+SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
 	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) .
 
 noinst_DATA = $(CRT0)
@@ -296,7 +301,7 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_FALSE@	stdlib/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	ctype/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	search/lib.$(aext) \
-@USE_LIBTOOL_FALSE@	stdio/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	$(LIBC_STDIO_LIB) \
 @USE_LIBTOOL_FALSE@	$(LIBC_STDIO64_LIB) \
 @USE_LIBTOOL_FALSE@	string/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	$(LIBC_SIGNAL_LIB) \
@@ -318,7 +323,7 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_TRUE@	stdlib/libstdlib.$(aext) \
 @USE_LIBTOOL_TRUE@	ctype/libctype.$(aext) \
 @USE_LIBTOOL_TRUE@	search/libsearch.$(aext) \
-@USE_LIBTOOL_TRUE@	stdio/libstdio.$(aext) \
+@USE_LIBTOOL_TRUE@	$(LIBC_STDIO_LIB) \
 @USE_LIBTOOL_TRUE@	$(LIBC_STDIO64_LIB) \
 @USE_LIBTOOL_TRUE@	string/libstring.$(aext) \
 @USE_LIBTOOL_TRUE@	$(LIBC_SIGNAL_LIB) \
@@ -347,7 +352,7 @@ libc_la_LDFLAGS = -Xcompiler -nostdlib
 SUBDEFS = \
 	stdlib/stmp-def \
 	ctype/stmp-def \
-	stdio/stmp-def \
+	$(LIBC_STDIO_DEF) \
 	$(LIBC_STDIO64_DEF) \
 	string/stmp-def \
 	$(LIBC_SIGNAL_DEF) \
diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in
index 3bfc6c09d..4cfa7bbbe 100644
--- a/newlib/libc/argz/Makefile.in
+++ b/newlib/libc/argz/Makefile.in
@@ -145,6 +145,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -162,6 +164,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/configure b/newlib/libc/configure
index 244f95fd8..9d85348f5 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=''
 
 ac_unique_file="sys.tex"
 ac_subdirs_all="$ac_subdirs_all machine sys"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir CFLAGS CPPFLAGS ac_ct_CC EXEEXT LN_S LIBTOOL subdirs CRT0 LIBC_POSIX_LIB HAVE_POSIX_DIR_TRUE HAVE_POSIX_DIR_FALSE LIBC_SIGNAL_LIB LIBC_SIGNAL_DEF HAVE_SIGNAL_DIR_TRUE HAVE_SIGNAL_DIR_FALSE LIBC_STDIO64_LIB LIBC_STDIO64_DEF HAVE_STDIO64_DIR_TRUE HAVE_STDIO64_DIR_FALSE LIBC_SYSCALL_LIB HAVE_SYSCALL_DIR_TRUE HAVE_SYSCALL_DIR_FALSE LIBC_UNIX_LIB HAVE_UNIX_DIR_TRUE HAVE_UNIX_DIR_FALSE LIBC_EXTRA_LIB LIBC_EXTRA_DEF extra_dir LIBC_SYS_LIB ENABLE_NEWLIB_ICONV_TRUE ENABLE_NEWLIB_ICONV_FALSE LIBC_MACHINE_LIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir CFLAGS CPPFLAGS ac_ct_CC EXEEXT LN_S LIBTOOL subdirs CRT0 LIBC_POSIX_LIB HAVE_POSIX_DIR_TRUE HAVE_POSIX_DIR_FALSE LIBC_SIGNAL_LIB LIBC_SIGNAL_DEF HAVE_SIGNAL_DIR_TRUE HAVE_SIGNAL_DIR_FALSE LIBC_STDIO_LIB LIBC_STDIO_DEF HAVE_STDIO_DIR_TRUE HAVE_STDIO_DIR_FALSE LIBC_STDIO64_LIB LIBC_STDIO64_DEF HAVE_STDIO64_DIR_TRUE HAVE_STDIO64_DIR_FALSE LIBC_SYSCALL_LIB HAVE_SYSCALL_DIR_TRUE HAVE_SYSCALL_DIR_FALSE LIBC_UNIX_LIB HAVE_UNIX_DIR_TRUE HAVE_UNIX_DIR_FALSE LIBC_EXTRA_LIB LIBC_EXTRA_DEF extra_dir LIBC_SYS_LIB ENABLE_NEWLIB_ICONV_TRUE ENABLE_NEWLIB_ICONV_FALSE LIBC_MACHINE_LIB LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -4926,6 +4926,29 @@ else
 fi
 
 
+LIBC_STDIO_LIB=
+LIBC_STDIO_DEF=
+if test -n "${stdio_dir}"; then
+  if test "${use_libtool}" = "yes"; then
+    LIBC_STDIO_LIB=${stdio_dir}/lib${stdio_dir}.${aext}
+  else
+    LIBC_STDIO_LIB=${stdio_dir}/lib.${aext}
+  fi
+  LIBC_STDIO_DEF=${stdio_dir}/stmp-def
+fi
+
+
+
+
+if test x${stdio_dir} != x; then
+  HAVE_STDIO_DIR_TRUE=
+  HAVE_STDIO_DIR_FALSE='#'
+else
+  HAVE_STDIO_DIR_TRUE='#'
+  HAVE_STDIO_DIR_FALSE=
+fi
+
+
 LIBC_STDIO64_LIB=
 LIBC_STDIO64_DEF=
 if test -n "${stdio64_dir}"; then
@@ -5245,6 +5268,13 @@ echo "$as_me: error: conditional \"HAVE_SIGNAL_DIR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_STDIO_DIR_TRUE}" && test -z "${HAVE_STDIO_DIR_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_STDIO_DIR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_STDIO_DIR\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${HAVE_STDIO64_DIR_TRUE}" && test -z "${HAVE_STDIO64_DIR_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_STDIO64_DIR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -5911,6 +5941,10 @@ s,@LIBC_SIGNAL_LIB@,$LIBC_SIGNAL_LIB,;t t
 s,@LIBC_SIGNAL_DEF@,$LIBC_SIGNAL_DEF,;t t
 s,@HAVE_SIGNAL_DIR_TRUE@,$HAVE_SIGNAL_DIR_TRUE,;t t
 s,@HAVE_SIGNAL_DIR_FALSE@,$HAVE_SIGNAL_DIR_FALSE,;t t
+s,@LIBC_STDIO_LIB@,$LIBC_STDIO_LIB,;t t
+s,@LIBC_STDIO_DEF@,$LIBC_STDIO_DEF,;t t
+s,@HAVE_STDIO_DIR_TRUE@,$HAVE_STDIO_DIR_TRUE,;t t
+s,@HAVE_STDIO_DIR_FALSE@,$HAVE_STDIO_DIR_FALSE,;t t
 s,@LIBC_STDIO64_LIB@,$LIBC_STDIO64_LIB,;t t
 s,@LIBC_STDIO64_DEF@,$LIBC_STDIO64_DEF,;t t
 s,@HAVE_STDIO64_DIR_TRUE@,$HAVE_STDIO64_DIR_TRUE,;t t
diff --git a/newlib/libc/configure.in b/newlib/libc/configure.in
index 5a5939f12..9fd8c8110 100644
--- a/newlib/libc/configure.in
+++ b/newlib/libc/configure.in
@@ -65,6 +65,20 @@ AC_SUBST(LIBC_SIGNAL_LIB)
 AC_SUBST(LIBC_SIGNAL_DEF)
 AM_CONDITIONAL(HAVE_SIGNAL_DIR, test x${signal_dir} != x)
 
+LIBC_STDIO_LIB=
+LIBC_STDIO_DEF=
+if test -n "${stdio_dir}"; then
+  if test "${use_libtool}" = "yes"; then
+    LIBC_STDIO_LIB=${stdio_dir}/lib${stdio_dir}.${aext}
+  else
+    LIBC_STDIO_LIB=${stdio_dir}/lib.${aext}
+  fi
+  LIBC_STDIO_DEF=${stdio_dir}/stmp-def
+fi
+AC_SUBST(LIBC_STDIO_LIB)
+AC_SUBST(LIBC_STDIO_DEF)
+AM_CONDITIONAL(HAVE_STDIO_DIR, test x${stdio_dir} != x)
+
 LIBC_STDIO64_LIB=
 LIBC_STDIO64_DEF=
 if test -n "${stdio64_dir}"; then
diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index 83706f8bb..27bf7dece 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -160,6 +160,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -177,6 +179,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in
index f3c463bd7..1238acc5c 100644
--- a/newlib/libc/errno/Makefile.in
+++ b/newlib/libc/errno/Makefile.in
@@ -118,6 +118,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -135,6 +137,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in
index a5c28d247..e55141906 100644
--- a/newlib/libc/iconv/Makefile.in
+++ b/newlib/libc/iconv/Makefile.in
@@ -109,6 +109,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -126,6 +128,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
index 5c48dbf2b..2f3e9215f 100644
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ b/newlib/libc/iconv/ccs/Makefile.in
@@ -167,6 +167,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -184,6 +186,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index 12d0da03b..635db7bcc 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -100,6 +100,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -117,6 +119,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in
index d2d9b48b1..5959174a8 100644
--- a/newlib/libc/iconv/ces/Makefile.in
+++ b/newlib/libc/iconv/ces/Makefile.in
@@ -126,6 +126,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -143,6 +145,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in
index 1708020e3..c114deda0 100644
--- a/newlib/libc/iconv/lib/Makefile.in
+++ b/newlib/libc/iconv/lib/Makefile.in
@@ -119,6 +119,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -136,6 +138,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in
index ec7089de6..848d358dc 100644
--- a/newlib/libc/locale/Makefile.in
+++ b/newlib/libc/locale/Makefile.in
@@ -130,6 +130,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -147,6 +149,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in
index 9fc7ba143..5956d0fc4 100644
--- a/newlib/libc/misc/Makefile.in
+++ b/newlib/libc/misc/Makefile.in
@@ -119,6 +119,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -136,6 +138,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 395d0b5f1..69ef701ea 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -148,6 +148,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -165,6 +167,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index 179140a5a..8193d53b1 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -149,6 +149,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -166,6 +168,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in
index 71a97eb94..e921fcf3e 100644
--- a/newlib/libc/search/Makefile.in
+++ b/newlib/libc/search/Makefile.in
@@ -137,6 +137,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -154,6 +156,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in
index 1956e5249..52e018080 100644
--- a/newlib/libc/signal/Makefile.in
+++ b/newlib/libc/signal/Makefile.in
@@ -118,6 +118,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -135,6 +137,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 09d83adf0..a3745f3c9 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -187,6 +187,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -204,6 +206,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in
index f9d14f3a1..af644564b 100644
--- a/newlib/libc/stdio64/Makefile.in
+++ b/newlib/libc/stdio64/Makefile.in
@@ -133,6 +133,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -150,6 +152,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index 9329cca85..db91687fb 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -207,6 +207,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -224,6 +226,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index 2e023176d..c5103f6b1 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -170,6 +170,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -187,6 +189,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in
index fd8b63913..08f253d79 100644
--- a/newlib/libc/syscalls/Makefile.in
+++ b/newlib/libc/syscalls/Makefile.in
@@ -135,6 +135,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -152,6 +154,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index 24e166f0e..16234f4ee 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -130,6 +130,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -147,6 +149,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index 87b0f9375..e6f4ef167 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -138,6 +138,8 @@ HAVE_SIGNAL_DIR_FALSE = @HAVE_SIGNAL_DIR_FALSE@
 HAVE_SIGNAL_DIR_TRUE = @HAVE_SIGNAL_DIR_TRUE@
 HAVE_STDIO64_DIR_FALSE = @HAVE_STDIO64_DIR_FALSE@
 HAVE_STDIO64_DIR_TRUE = @HAVE_STDIO64_DIR_TRUE@
+HAVE_STDIO_DIR_FALSE = @HAVE_STDIO_DIR_FALSE@
+HAVE_STDIO_DIR_TRUE = @HAVE_STDIO_DIR_TRUE@
 HAVE_SYSCALL_DIR_FALSE = @HAVE_SYSCALL_DIR_FALSE@
 HAVE_SYSCALL_DIR_TRUE = @HAVE_SYSCALL_DIR_TRUE@
 HAVE_UNIX_DIR_FALSE = @HAVE_UNIX_DIR_FALSE@
@@ -155,6 +157,8 @@ LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
 LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
 LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@