* 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-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
# 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 \
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`; \
$(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`; \
@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
# 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 \
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`; \
$(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`; \
@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
# 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" ""]
# 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] {
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
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];
# 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" ""]