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.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ae96c236e2df7f9c3e8705e3869d10576e25596c..d0a20e5a44af2941ed7c391ebbdb37b819f241a9 100644 (file)
--- 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 afebb6b18a19809441db1ba1243d474c9009783a..cd8fa61c28d4200d8a60627ec0be1d350a69226e 100644 (file)
--- 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 caaa6f76742a6ba2660150028af921d2aed0255d..7ce0e604811bde80e7cc085a5469e7155ada22f2 100644 (file)
--- 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 8cb46925f9932cf85630e85a2e4fd53ae3ed77dc..4bf7438af99a4a28b52b26ad07a4f6d98a973123 100644 (file)
--- 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 f6bffde1f5253e26f962ddf8daa9a3bea723dea0..ebc69286f27bcc5a01a044d0f0e277bde9169115 100644 (file)
--- 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 c53a8a8193c5ce6180ed4e5cc0ae1c295113df1a..f1df40e5261801c1f547c66f90ff7bb948d90aaf 100644 (file)
--- 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 82dc0093cc3270fe080d4375c10ce98db2a1677f..3532c8b991f024ac4f78d1b8a43b125350ff0dab 100644 (file)
--- 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" ""]