* Makefile.in (SUBDIRS): Add chillrt.

	* Makefile.in (all.normal):  Add all-chillrt.
	* Makefile.in (all.cross):  Add all-chillrt.
	* Makefile.in (install-no-fixedincludes):  Add install-chillrt.
	* Makefile.in (install.cross):  Add install-chillrt.
	* Makefile.in (all-chillrt, install-chillrt):  New targets.
	* Makefile.in (subdir_do):  Handle chillrt like newlib.
	* configure.in (target_libs):  Add chillrt.

	(Also added appropriate stuff to .Sanitize)

diff --git a/.Sanitize b/.Sanitize
index 6ba5688f0cb9334cc686e02bc9bbfca89c8719a6..de82b5cdfc46ef2a4d8d229c6864e34f6cfd6bd8 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -15,6 +15,10 @@
 
 Do-first:
 
+if ( echo $* | grep keep\-chill > /dev/null ) ; then
+       keep_these_too="chillrt"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -118,6 +122,55 @@ else
        done
 fi
 
+echo Thawing away the \"chill\"...
+
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+if ( echo $* | grep keep\-chill > /dev/null ) ; then
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
+                       echo Keeping chill stuff in $i
+               fi
+       done
+else
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
+                       echo Thawing the \"chill\" out of $i...
+                       cp $i new
+                       sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               echo Caching $i in .Recover...
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+       echo Thawing more \"chill\" out of Makefile.in...
+       cp Makefile.in new
+       sed -e 's/ chillrt / /g' \
+           -e 's/newlib, chillrt/newlib/g' \
+           -e 's/ all-chillrt / /g' \
+           -e '/^[     ]*install-chillrt[      ]*\\$/d' \
+           -e 's/ install-chillrt / /g' \
+           -e 's/newlib \| chillrt/newlib/g' \
+           -e 's/install-man install-libchill install-librmt/install-man/g' \
+           < Makefile.in > new
+       if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
+               echo Caching Makefile.in in .Recover...
+               mv Makefile.in .Recover
+       fi
+       mv new Makefile.in
+       echo Thawing the \"chill\" out of configure.in...
+       cp configure.in new
+       sed -e 's/ chillrt / /g' \
+           < configure.in > new
+       if [ -n "${safe}" -a ! -f .Recover/configure.in ] ; then
+               echo Caching configure.in in .Recover...
+               mv configure.in .Recover
+       fi
+       mv new configure.in
+fi
+
 for i in * ; do
        if test ! -d $i && (grep sanitize $i > /dev/null) ; then
                echo Some mentions of Sanitize are still left in $i!

diff --git a/configure.in b/configure.in
index 6fa635508c9cab15157f4328fb207743be73549b..319e3b0432db733f82c14e1b34ac8953b479a544 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
 # these libraries are built for the target environment, and are built after
 # the host libraries and the host tools (which may be a cross compiler)
 #
-target_libs="libm xiberty newlib libg++"
+target_libs="libm xiberty newlib chillrt libg++"
 
 # these tools are built using the target libs, and are intended to run only
 # in the target environment.  we currently have none.