newlib: punt unused LIBC_EXTRA_LIB settings

This was added decades ago, but the commit message lacks any
explanation, and it was unused when it was merged.  It's still
unused today.  So punt it all.

28 files changed, 21 insertions, 142 deletions

diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index d1540c8..cdeaf84 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -39,7 +39,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_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
-	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
+	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
 	$(XDR_SUBDIR) ssp .
 
 noinst_DATA = $(CRT0)
@@ -59,7 +59,6 @@ SUBLIBS = \
 	time/libtime.$(aext) \
 	locale/liblocale.$(aext) \
 	reent/libreent.$(aext) \
-	$(LIBC_EXTRA_LIB) \
 	errno/liberrno.$(aext) \
 	misc/libmisc.$(aext) \
 	ssp/libssp.$(aext) \
@@ -83,7 +82,6 @@ SUBLIBS = \
 	time/lib.$(aext) \
 	locale/lib.$(aext) \
 	reent/lib.$(aext) \
-	$(LIBC_EXTRA_LIB) \
 	errno/lib.$(aext) \
 	misc/lib.$(aext) \
 	ssp/lib.$(aext) \
@@ -139,16 +137,15 @@ SUBDEFS = \
 	time/stmp-def \
 	locale/stmp-def \
 	reent/stmp-def \
-	$(LIBC_EXTRA_DEF) \
 	misc/stmp-def
 
 # ditto for stmp-xml files in each subdirectory which builds .xml files
 SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml)
 
-libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
+libc.info: sigset.texi stdio64.texi posix.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
-libc.dvi: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
+libc.dvi: sigset.texi stdio64.texi posix.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
 stmp-sigset: config.status
@@ -173,17 +170,6 @@ stmp-iconvset: config.status
 
 iconvset.texi: stmp-iconvset ; @true
 
-stmp-extra: config.status
-	if test -n "$(LIBC_EXTRA_LIB)"; then \
-	  echo "@set EXTRA" >tmp-extra.texi; \
-	else \
-	  echo "@clear EXTRA" >tmp-extra.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp-extra.texi extra.texi
-	touch $@
-
-extra.texi: stmp-extra ; @true
-
 stmp-stdio64: config.status
 	if test -n "$(LIBC_STDIO64_LIB)"; then \
 	  echo "@set STDIO64" >tmp-stdio64.texi; \
@@ -224,7 +210,7 @@ $(SUBDEFS): stmp-targetdep ; @true
 
 TEXINFO_TEX = ../../texinfo/texinfo.tex
 info_TEXINFOS = libc.texi
-libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
+libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
 docbook-recursive: force
@@ -248,9 +234,9 @@ install-man: man
 force:
 
 CLEANFILES = $(CRT0) \
-	sigset.texi stmp-sigset extra.texi stmp-extra \
+	sigset.texi stmp-sigset \
 	stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \
-	tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \
+	tmp-sigset.texi tmp-iconvset.texi \
 	tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \
 	*.xml *.3
 
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index 5a98f48..3fcd00d 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -131,12 +131,11 @@ am__DEPENDENCIES_1 =
 @USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 @USE_LIBTOOL_FALSE@	string/lib.$(aext) $(am__DEPENDENCIES_1) \
 @USE_LIBTOOL_FALSE@	time/lib.$(aext) locale/lib.$(aext) \
-@USE_LIBTOOL_FALSE@	reent/lib.$(aext) $(am__DEPENDENCIES_1) \
-@USE_LIBTOOL_FALSE@	errno/lib.$(aext) misc/lib.$(aext) \
-@USE_LIBTOOL_FALSE@	ssp/lib.$(aext) $(am__DEPENDENCIES_1) \
+@USE_LIBTOOL_FALSE@	reent/lib.$(aext) errno/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	misc/lib.$(aext) ssp/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-@USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1)
+@USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+@USE_LIBTOOL_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 @USE_LIBTOOL_TRUE@am__DEPENDENCIES_3 = argz/libargz.$(aext) \
 @USE_LIBTOOL_TRUE@	stdlib/libstdlib.$(aext) \
 @USE_LIBTOOL_TRUE@	ctype/libctype.$(aext) \
@@ -146,7 +145,7 @@ am__DEPENDENCIES_1 =
 @USE_LIBTOOL_TRUE@	string/libstring.$(aext) \
 @USE_LIBTOOL_TRUE@	$(am__DEPENDENCIES_1) time/libtime.$(aext) \
 @USE_LIBTOOL_TRUE@	locale/liblocale.$(aext) \
-@USE_LIBTOOL_TRUE@	reent/libreent.$(aext) $(am__DEPENDENCIES_1) \
+@USE_LIBTOOL_TRUE@	reent/libreent.$(aext) \
 @USE_LIBTOOL_TRUE@	errno/liberrno.$(aext) misc/libmisc.$(aext) \
 @USE_LIBTOOL_TRUE@	ssp/libssp.$(aext) $(am__DEPENDENCIES_1) \
 @USE_LIBTOOL_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -305,8 +304,8 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = argz stdlib ctype search stdio stdio64 string signal \
-	time locale sys reent @extra_dir@ errno misc machine unix \
-	posix syscalls iconv xdr ssp .
+	time locale sys reent errno misc machine unix posix syscalls \
+	iconv xdr ssp .
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -344,8 +343,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -416,7 +413,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -468,7 +464,7 @@ top_srcdir = @top_srcdir@
 # 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 sys reent \
-	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
+	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
 	$(XDR_SUBDIR) ssp .
 
 noinst_DATA = $(CRT0)
@@ -486,7 +482,6 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_FALSE@	time/lib.$(aext) \
 @USE_LIBTOOL_FALSE@	locale/lib.$(aext) \
 @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@	ssp/lib.$(aext) \
@@ -510,7 +505,6 @@ noinst_DATA = $(CRT0)
 @USE_LIBTOOL_TRUE@	time/libtime.$(aext) \
 @USE_LIBTOOL_TRUE@	locale/liblocale.$(aext) \
 @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@	ssp/libssp.$(aext) \
@@ -542,7 +536,6 @@ SUBDEFS = \
 	time/stmp-def \
 	locale/stmp-def \
 	reent/stmp-def \
-	$(LIBC_EXTRA_DEF) \
 	misc/stmp-def
 
 
@@ -550,13 +543,13 @@ SUBDEFS = \
 SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml)
 TEXINFO_TEX = ../../texinfo/texinfo.tex
 info_TEXINFOS = libc.texi
-libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
+libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
 CLEANFILES = $(CRT0) \
-	sigset.texi stmp-sigset extra.texi stmp-extra \
+	sigset.texi stmp-sigset \
 	stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \
-	tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \
+	tmp-sigset.texi tmp-iconvset.texi \
 	tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \
 	*.xml *.3
 
@@ -1132,10 +1125,10 @@ crt0.o: sys/crt0.o
 
 sys/crt0.o: ; @true
 
-libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
+libc.info: sigset.texi stdio64.texi posix.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
-libc.dvi: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
+libc.dvi: sigset.texi stdio64.texi posix.texi iconvset.texi \
 	targetdep.tex $(SUBDEFS)
 
 stmp-sigset: config.status
@@ -1160,17 +1153,6 @@ stmp-iconvset: config.status
 
 iconvset.texi: stmp-iconvset ; @true
 
-stmp-extra: config.status
-	if test -n "$(LIBC_EXTRA_LIB)"; then \
-	  echo "@set EXTRA" >tmp-extra.texi; \
-	else \
-	  echo "@clear EXTRA" >tmp-extra.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp-extra.texi extra.texi
-	touch $@
-
-extra.texi: stmp-extra ; @true
-
 stmp-stdio64: config.status
 	if test -n "$(LIBC_STDIO64_LIB)"; then \
 	  echo "@set STDIO64" >tmp-stdio64.texi; \
diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in
index 72aa3cf..48c1b5f 100644
--- a/newlib/libc/argz/Makefile.in
+++ b/newlib/libc/argz/Makefile.in
@@ -254,8 +254,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -326,7 +324,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/configure b/newlib/libc/configure
index fdf7555..2f4feec 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -640,9 +640,6 @@ ENABLE_NEWLIB_ICONV_TRUE
 HAVE_LONG_DOUBLE_FALSE
 HAVE_LONG_DOUBLE_TRUE
 LIBC_SYS_LIB
-extra_dir
-LIBC_EXTRA_DEF
-LIBC_EXTRA_LIB
 HAVE_UNIX_DIR_FALSE
 HAVE_UNIX_DIR_TRUE
 LIBC_UNIX_LIB
@@ -11695,7 +11692,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11698 "configure"
+#line 11695 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11801,7 +11798,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11804 "configure"
+#line 11801 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12193,14 +12190,6 @@ else
 fi
 
 
-LIBC_EXTRA_LIB=
-LIBC_EXTRA_DEF=
-extra_dir=
-
-
-
-
-
 
 LIBC_SYS_LIB=
 if test -n "${sys_dir}"; then
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index c23282d..9ed0a5a 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -162,14 +162,6 @@ 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 0f23a2a..0522540 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -312,8 +312,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -384,7 +382,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in
index 49c5b8a..6b87401 100644
--- a/newlib/libc/errno/Makefile.in
+++ b/newlib/libc/errno/Makefile.in
@@ -227,8 +227,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -299,7 +297,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in
index 02380cb..41fe01b 100644
--- a/newlib/libc/iconv/Makefile.in
+++ b/newlib/libc/iconv/Makefile.in
@@ -226,8 +226,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -298,7 +296,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
index e0c6215..3bd5974 100644
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ b/newlib/libc/iconv/ccs/Makefile.in
@@ -293,8 +293,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -365,7 +363,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index add0dab..a6bd943 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -192,8 +192,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -264,7 +262,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in
index 1565b4c..87bacf5 100644
--- a/newlib/libc/iconv/ces/Makefile.in
+++ b/newlib/libc/iconv/ces/Makefile.in
@@ -232,8 +232,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -304,7 +302,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in
index c6220a7..965a8fe 100644
--- a/newlib/libc/iconv/lib/Makefile.in
+++ b/newlib/libc/iconv/lib/Makefile.in
@@ -225,8 +225,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -297,7 +295,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/libc.texi b/newlib/libc/libc.texi
index f8c820b..0cab220 100644
--- a/newlib/libc/libc.texi
+++ b/newlib/libc/libc.texi
@@ -138,7 +138,6 @@ into another language, under the above conditions for modified versions.
 @c switch to set SIGNALS on or off, according to whether config picks up
 @c signal subdirectory:
 @include sigset.texi
-@include extra.texi
 @include posix.texi
 @include stdio64.texi
 @include iconvset.texi
diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in
index 202891f..14acd72 100644
--- a/newlib/libc/locale/Makefile.in
+++ b/newlib/libc/locale/Makefile.in
@@ -243,8 +243,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -315,7 +313,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in
index 1cf402d..9bd718f 100644
--- a/newlib/libc/misc/Makefile.in
+++ b/newlib/libc/misc/Makefile.in
@@ -236,8 +236,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -308,7 +306,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 7e1d8c5..3b1f09b 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -266,8 +266,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -338,7 +336,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index d02eb8a..745c7f1 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -262,8 +262,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -334,7 +332,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in
index 84189ed..efc3a84 100644
--- a/newlib/libc/search/Makefile.in
+++ b/newlib/libc/search/Makefile.in
@@ -251,8 +251,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -323,7 +321,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in
index bf9dc8c..2827897 100644
--- a/newlib/libc/signal/Makefile.in
+++ b/newlib/libc/signal/Makefile.in
@@ -228,8 +228,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -300,7 +298,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/ssp/Makefile.in b/newlib/libc/ssp/Makefile.in
index de54b57..66a9df8 100644
--- a/newlib/libc/ssp/Makefile.in
+++ b/newlib/libc/ssp/Makefile.in
@@ -251,8 +251,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -323,7 +321,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 80370cb..6b9c9c4 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -418,8 +418,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -490,7 +488,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in
index 062fe99..c19d6dd 100644
--- a/newlib/libc/stdio64/Makefile.in
+++ b/newlib/libc/stdio64/Makefile.in
@@ -242,8 +242,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -314,7 +312,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index 9ec65b4..4ca8b60 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -345,8 +345,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -417,7 +415,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index 1ce4be4..d60bfa2 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -329,8 +329,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -401,7 +399,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in
index 3d6feba..ee083bc 100644
--- a/newlib/libc/syscalls/Makefile.in
+++ b/newlib/libc/syscalls/Makefile.in
@@ -245,8 +245,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -317,7 +315,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index 234c6aa..2f2a8b1 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -241,8 +241,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -313,7 +311,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index 747f487..910006b 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -247,8 +247,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -319,7 +317,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/newlib/libc/xdr/Makefile.in b/newlib/libc/xdr/Makefile.in
index fe3e954..3b58dfa 100644
--- a/newlib/libc/xdr/Makefile.in
+++ b/newlib/libc/xdr/Makefile.in
@@ -240,8 +240,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
@@ -312,7 +310,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-extra_dir = @extra_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@