* libc/Makefile.am (SUBLIBS): Add LIBC_EXTRA_LIB.

	(SUBDEFS): Add LIBC_EXTRA_DEF.
	* libc/configure.in (LIBC_EXTRA_LIB): New variable.
	(LIBC_EXTRA_DEF): Likewise.
	(extra_dir): Likewise.
	* libc/machine/xscale/machine: New directory.
	* libc/machine/xscale/machine/profile.h: New file.

	* Makefile.am (site.exp): Remove newlib_cflags.  Add
	multibuildtop.
	* testsuite/newlib.locale/UTF-8.c: Change fprintf's to printf's.
	* testsuite/lib/flags.exp: New file.
	* testsuite/lib/newlib.exp: Load flags.exp.
	(newlib_target_compile): Remove libgloss directory references.
	(newlib_init): Remove newlib_cflags references.

19 files changed, 166 insertions, 3 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 4cca9fbfe..46059fbe8 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,5 +1,13 @@
 2002-05-01  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
+	* libc/Makefile.am (SUBLIBS): Add LIBC_EXTRA_LIB.
+	(SUBDEFS): Add LIBC_EXTRA_DEF.
+	* libc/configure.in (LIBC_EXTRA_LIB): New variable.
+	(LIBC_EXTRA_DEF): Likewise.
+	(extra_dir): Likewise.
+	* libc/machine/xscale/machine: New directory.
+	* libc/machine/xscale/machine/profile.h: New file.
+
 	* Makefile.am (site.exp): Remove newlib_cflags.  Add
 	multibuildtop.
 	* testsuite/newlib.locale/UTF-8.c: Change fprintf's to printf's.
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 0937818c7..fb8fbb563 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -21,7 +21,7 @@ endif
 # The order of SUBDIRS is important for the integrated documentation.
 # Do not change the order without considering the doc impact.
 SUBDIRS = stdlib ctype stdio string $(SIGNAL_SUBDIR) time locale sys reent \
-	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
+	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
 
 noinst_DATA = $(CRT0)
 
@@ -37,6 +37,7 @@ SUBLIBS = \
 	locale/liblocale.$(aext) \
 	$(LIBC_SYS_LIB) \
 	reent/libreent.$(aext) \
+	$(LIBC_EXTRA_LIB) \
 	errno/liberrno.$(aext) \
 	misc/libmisc.$(aext) \
 	$(LIBC_MACHINE_LIB) \
@@ -55,6 +56,7 @@ SUBLIBS = \
 	locale/lib.$(aext) \
 	$(LIBC_SYS_LIB) \
 	reent/lib.$(aext) \
+	$(LIBC_EXTRA_LIB) \
 	errno/lib.$(aext) \
 	misc/lib.$(aext) \
 	$(LIBC_MACHINE_LIB) \
@@ -105,6 +107,7 @@ SUBDEFS = \
 	time/stmp-def \
 	locale/stmp-def \
 	reent/stmp-def \
+	$(LIBC_EXTRA_DEF) \
 	misc/stmp-def
 
 libc.info: sigset.texi targetdep.tex $(SUBDEFS)
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index 5d685de73..e42c7572b 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -71,6 +71,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -88,6 +90,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -107,7 +110,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 = stdlib ctype stdio string $(SIGNAL_SUBDIR) time locale sys reent \
-	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
+	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
 
 
 noinst_DATA = $(CRT0)
@@ -123,6 +126,7 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_TRUE@	locale/liblocale.$(aext) \
 @USE_LIBTOOL_TRUE@	$(LIBC_SYS_LIB) \
 @USE_LIBTOOL_TRUE@	reent/libreent.$(aext) \
+@USE_LIBTOOL_TRUE@	$(LIBC_EXTRA_LIB) \
 @USE_LIBTOOL_TRUE@	errno/liberrno.$(aext) \
 @USE_LIBTOOL_TRUE@	misc/libmisc.$(aext) \
 @USE_LIBTOOL_TRUE@	$(LIBC_MACHINE_LIB) \
@@ -139,6 +143,7 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_FALSE@	locale/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	$(LIBC_SYS_LIB) \
 @USE_LIBTOOL_FALSE@	reent/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	$(LIBC_EXTRA_LIB) \
 @USE_LIBTOOL_FALSE@	errno/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	misc/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	$(LIBC_MACHINE_LIB) \
@@ -167,6 +172,7 @@ SUBDEFS = \
 	time/stmp-def \
 	locale/stmp-def \
 	reent/stmp-def \
+	$(LIBC_EXTRA_DEF) \
 	misc/stmp-def
 
 
@@ -216,7 +222,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 DIST_SUBDIRS =  stdlib ctype stdio string signal time locale sys reent \
-errno misc machine unix posix syscalls .
+@extra_dir@ errno misc machine unix posix syscalls .
 SOURCES = libc.a.c $(libc_la_SOURCES)
 OBJECTS = libc.a.o $(libc_la_OBJECTS)
 
diff --git a/newlib/libc/configure b/newlib/libc/configure
index aad9bc3cd..589758066 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -2400,6 +2400,14 @@ else
   HAVE_UNIX_DIR_FALSE=
 fi
 
+LIBC_EXTRA_LIB=
+LIBC_EXTRA_DEF=
+extra_dir=
+
+
+
+
+
 
 LIBC_SYS_LIB=
 if test -n "${sys_dir}"; then
@@ -2630,6 +2638,9 @@ s%@HAVE_SYSCALL_DIR_FALSE@%$HAVE_SYSCALL_DIR_FALSE%g
 s%@LIBC_UNIX_LIB@%$LIBC_UNIX_LIB%g
 s%@HAVE_UNIX_DIR_TRUE@%$HAVE_UNIX_DIR_TRUE%g
 s%@HAVE_UNIX_DIR_FALSE@%$HAVE_UNIX_DIR_FALSE%g
+s%@LIBC_EXTRA_LIB@%$LIBC_EXTRA_LIB%g
+s%@LIBC_EXTRA_DEF@%$LIBC_EXTRA_DEF%g
+s%@extra_dir@%$extra_dir%g
 s%@LIBC_SYS_LIB@%$LIBC_SYS_LIB%g
 s%@LIBC_MACHINE_LIB@%$LIBC_MACHINE_LIB%g
 
diff --git a/newlib/libc/configure.in b/newlib/libc/configure.in
index eeb5286bd..0fb66034a 100644
--- a/newlib/libc/configure.in
+++ b/newlib/libc/configure.in
@@ -77,6 +77,14 @@ fi
 AC_SUBST(LIBC_UNIX_LIB)
 AM_CONDITIONAL(HAVE_UNIX_DIR, test x${unix_dir} != x)
 
+LIBC_EXTRA_LIB=
+LIBC_EXTRA_DEF=
+extra_dir=
+
+AC_SUBST(LIBC_EXTRA_LIB)
+AC_SUBST(LIBC_EXTRA_DEF)
+AC_SUBST(extra_dir)
+
 dnl We always recur into sys and machine, and let them decide what to
 dnl do.  However, we do need to know whether they will produce a library.
 
diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index d4df60ea9..996052836 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in
index ac7e311f9..d049c39eb 100644
--- a/newlib/libc/errno/Makefile.in
+++ b/newlib/libc/errno/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in
index f65881e64..79791cd45 100644
--- a/newlib/libc/locale/Makefile.in
+++ b/newlib/libc/locale/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/machine/xscale/machine/profile.h b/newlib/libc/machine/xscale/machine/profile.h
new file mode 100644
index 000000000..90198ba69
--- /dev/null
+++ b/newlib/libc/machine/xscale/machine/profile.h
@@ -0,0 +1,88 @@
+/* profile.h
+
+   Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
+ 
+   Permission to use, copy, modify, and distribute this software
+   is freely granted, provided that this notice is preserved.  */
+
+#ifndef __XSCALE_PROFILE_H__
+#define __XSCALE_PROFILE_H__
+
+/* FIXME:
+   We need to create a string version of the CPP predefined
+   __USER_LABEL_PREFIX__ macro.  Ideally we would like to
+   so do something like:
+
+     #if  __USER_LABEL_PREFIX__ == _
+
+   but this fails for arm-elf targets because although
+   __USER_LABEL__PREFIX__ is defined, it is not defined to
+   a specific value (even 0) and so the above test fails
+   with:
+   
+      operator '==' has no left operand
+
+  Instead we have to test the CPP predefined __ELF__ and
+  rely upon the *assumption* that ELF targets will not use
+  an underscore prefix and that COFF targets will.  */
+
+#ifdef __ELF__
+#define FOO ""
+#else
+#define FOO "_"
+#endif
+
+#define _MCOUNT_DECL(frompc, selfpc) \
+void __attribute__ ((no_instrument_function)) \
+mcount_internal (frompc, selfpc)
+
+/* mcount_internal expects two arguments
+   r0 frompc (return address for function that call function that calls mcount)
+   r1 selfpc (return address for function that called mcount)
+
+   The frompc is extracted from the stack frames. If the code does not
+   generate stack frames, then mcount cannot extract this
+   information. Thus, the -fomit-frame-pointer optimization cannot be
+   used if a call graph information is required.
+
+   Due to optimizations mcount doesn't set up a new fp. mcount has the fp
+   of the calling function.
+
+   r0 frompc is from the current frame
+   r1 selfpc can be obtained directly from lr.  */
+
+#ifdef __thumb__
+#define MCOUNT					\
+void __attribute__ ((naked))			\
+     __attribute__ ((no_instrument_function))	\
+mcount (void)					\
+{						\
+  __asm__("push {r0, r1, r2, r3, lr};"		\
+	  "add r0, r7, #0;"			\
+	  "beq 1f;"				\
+	  "sub r0, r0, #4;"			\
+	  "ldr r0, [r0];"			\
+	  "1: mov r1, lr;"			\
+	  "bl " FOO "mcount_internal ;"		\
+	  "pop {r0, r1, r2, r3, pc};"		\
+	);					\
+}
+#else
+#define MCOUNT					\
+void __attribute__ ((naked))			\
+     __attribute__ ((no_instrument_function))	\
+mcount (void)					\
+{						\
+  __asm__("stmdb sp!, {r0, r1, r2, r3, lr};"	\
+	  "movs r0, fp;"			\
+	  "ldrne r0, [r0, #-4];"		\
+	  "mov r1, lr;"				\
+	  "bl " FOO "mcount_internal ;" 	\
+          "ldmia sp!, {r0, r1, r2, r3, pc};"	\
+	);					\
+}
+#endif
+
+#define FUNCTION_ALIGNMENT 2
+
+#endif /* !__XSCALE_PROFILE_H__ */
diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in
index a13208666..67f6cf4d5 100644
--- a/newlib/libc/misc/Makefile.in
+++ b/newlib/libc/misc/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 7dd907d3c..df94cf2cf 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index ec03dc655..2f61b2fe3 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in
index 68c6961c3..d732e009e 100644
--- a/newlib/libc/signal/Makefile.in
+++ b/newlib/libc/signal/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 547e2359e..6e60de47f 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index b29bfe6f5..d56a3129c 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index 51ce701c5..afc2b83c1 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in
index d5e9be29a..0f04d1dfc 100644
--- a/newlib/libc/syscalls/Makefile.in
+++ b/newlib/libc/syscalls/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index d9102f268..58ebf0ce7 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index d1de62e59..9b0e36d2a 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -72,6 +72,8 @@ CRT0 = @CRT0@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
+LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
+LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
@@ -89,6 +91,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
+extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@