2005-07-04 Mark Mitchell <mark@codesourcery.com>

        * Makefile.am (site.exp): Set tmpdir.
        * Makefile.in: Regenerated.
        * testsuite/lib/checkoutput.exp (newlib_check_output): Put
        executables in $tmpdir.
        * testsuite/lib/flags.exp (libgloss_link_flags): Use the original
        libgloss version if not running in the build directory.
        * testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
        $tmpdir.
        * testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
        in $tmpdir.

7 files changed, 51 insertions, 8 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ae96c236e..d0a20e5a4 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.am (site.exp): Set tmpdir.
+	* Makefile.in: Regenerated.
+	* testsuite/lib/checkoutput.exp (newlib_check_output): Put
+	executables in $tmpdir.
+	* testsuite/lib/flags.exp (libgloss_link_flags): Use the original
+	libgloss version if not running in the build directory.
+	* testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
+	$tmpdir.
+	* testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
+	in $tmpdir.
+
 2005-06-28  Dave Korn  <dave.korn@artimi.com>
 
 	* libm/common/s_lrint.c (lrint):  Fix signed-vs-unsigned comparison
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index afebb6b18..cd8fa61c2 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -189,7 +189,7 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine
+	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
 	cp newlib.h targ-include/newlib.h
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
@@ -216,6 +216,11 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -276,6 +281,11 @@ endif
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -342,6 +352,7 @@ site.exp: Makefile
 	@echo 'set tool_version $(VERSION)' >> $@-t
 	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
+	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
 	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
 	@echo 'set host_alias $(build_alias)' >> $@-t
 	@echo 'set host_triplet $(build_triplet)' >> $@-t
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index caaa6f767..7ce0e6048 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -700,7 +700,7 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine
+	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
 	cp newlib.h targ-include/newlib.h
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
@@ -727,6 +727,11 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -782,6 +787,11 @@ install-data-local:	install-toollibLIBRARIES
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -840,6 +850,7 @@ site.exp: Makefile
 	@echo 'set tool_version $(VERSION)' >> $@-t
 	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
+	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
 	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
 	@echo 'set host_alias $(build_alias)' >> $@-t
 	@echo 'set host_triplet $(build_triplet)' >> $@-t
diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp
index 8cb46925f..4bf7438af 100644
--- a/newlib/testsuite/lib/checkoutput.exp
+++ b/newlib/testsuite/lib/checkoutput.exp
@@ -9,10 +9,10 @@
 # It assumes one line of output per test.
 
 proc newlib_check_output { srcfile expectlist } {
-    global objdir subdir srcdir
+    global subdir srcdir tmpdir
 
     set srcfullname "$srcdir/$subdir/$srcfile"
-    set test_driver "$objdir/testsuite/[file tail [file rootname $srcfullname].x]"
+    set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
 
     set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]
 
diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
index f6bffde1f..ebc69286f 100644
--- a/newlib/testsuite/lib/flags.exp
+++ b/newlib/testsuite/lib/flags.exp
@@ -12,12 +12,20 @@
 # directories, rather than in the build and source paths of the
 # compiler being used.
 
+if {![llength [info procs saved_libgloss_link_flags]]} {
+    rename libgloss_link_flags saved_libgloss_link_flags
+}
+
 proc libgloss_link_flags { args } {
     global target_cpu
     # These values come from the local site.exp.
     global srcdir objdir
     global multibuildtop
 
+    if {![info exists multibuildtop]} {
+	return [saved_libgloss_link_flags $args]
+    }
+
     verbose "In newlib version of libgloss_link_flags...\n"
 
     if [isnative] {
diff --git a/newlib/testsuite/lib/newlib.exp b/newlib/testsuite/lib/newlib.exp
index c53a8a819..f1df40e52 100644
--- a/newlib/testsuite/lib/newlib.exp
+++ b/newlib/testsuite/lib/newlib.exp
@@ -23,7 +23,7 @@ proc newlib_init { args } {
     global newlib_initialized
     global target_info
     # These values are initialized in the local site.exp file.
-    global srcdir objdir
+    global srcdir objdir tmpdir
     global host_triplet target_triplet
     global old_ld_library_path
 
@@ -34,7 +34,7 @@ proc newlib_init { args } {
     if {[target_info needs_status_wrapper] != "" && \
 	    [target_info needs_status_wrapper] != "0" && \
 	    ![info exists gluefile]} {
-	set gluefile ${objdir}/testsuite/testglue.o;
+	set gluefile ${tmpdir}/testglue.o;
 	set result [build_wrapper $gluefile];
 	if { $result != "" } {
 	    set gluefile [lindex $result 0];
diff --git a/newlib/testsuite/lib/passfail.exp b/newlib/testsuite/lib/passfail.exp
index 82dc0093c..3532c8b99 100644
--- a/newlib/testsuite/lib/passfail.exp
+++ b/newlib/testsuite/lib/passfail.exp
@@ -32,11 +32,11 @@ proc newlib_pass_fail_all { flag exclude_list } {
 # compiles and runs.
 
 proc newlib_pass_fail { srcfile } {
-    global srcdir objdir subdir
+    global srcdir tmpdir subdir
 
     set fullsrcfile "$srcdir/$subdir/$srcfile"
 
-    set test_driver "$objdir/testsuite/[file rootname $srcfile].x"
+    set test_driver "$tmpdir/[file rootname $srcfile].x"
 
     set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]