diff options
| -rw-r--r-- | newlib/ChangeLog | 11 | ||||
| -rw-r--r-- | newlib/Makefile.am | 6 | ||||
| -rw-r--r-- | newlib/Makefile.in | 6 | ||||
| -rw-r--r-- | newlib/testsuite/lib/newlib.exp | 23 |
4 files changed, 26 insertions, 20 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index af41985d2..78254f1f7 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,14 @@ +2002-04-30 Thomas Fitzsimmons <fitzsim@redhat.com> + + * Makefile.am (site.exp): Change host_alias, host_triplet, + target_alias, target_triplet to refer to gcc's host and target + variables (newlib's build and host variables). + * testsuite/lib/newlib.exp (newlib_init): Change build + references to host references, host references to target + references to reflect Makefile.am changes. + (newlib_target_compile): Likewise. + (newlib_finish): Likewise. + 2002-04-29 Jeff Johnston <jjohnstn@redhat.com> * libc/sys/linux/io64.c (fstat64, lstat64): New syscalls added. diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 329464962..ebf923df5 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -292,10 +292,8 @@ site.exp: Makefile @echo 'set srcdir $(srcdir)/testsuite' >> $@-t @echo 'set objdir' `pwd` >> $@-t @echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t - @echo 'set build_alias $(build_alias)' >> $@-t - @echo 'set build_triplet $(build_triplet)' >> $@-t - @echo 'set host_alias $(host_alias)' >> $@-t - @echo 'set host_triplet $(host_triplet)' >> $@-t + @echo 'set host_alias $(build_alias)' >> $@-t + @echo 'set host_triplet $(build_triplet)' >> $@-t @echo 'set target_alias $(host_alias)' >> $@-t @echo 'set target_triplet $(host_triplet)' >> $@-t @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 7314634ee..09d50a992 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -805,10 +805,8 @@ site.exp: Makefile @echo 'set srcdir $(srcdir)/testsuite' >> $@-t @echo 'set objdir' `pwd` >> $@-t @echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t - @echo 'set build_alias $(build_alias)' >> $@-t - @echo 'set build_triplet $(build_triplet)' >> $@-t - @echo 'set host_alias $(host_alias)' >> $@-t - @echo 'set host_triplet $(host_triplet)' >> $@-t + @echo 'set host_alias $(build_alias)' >> $@-t + @echo 'set host_triplet $(build_triplet)' >> $@-t @echo 'set target_alias $(host_alias)' >> $@-t @echo 'set target_triplet $(host_triplet)' >> $@-t @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t diff --git a/newlib/testsuite/lib/newlib.exp b/newlib/testsuite/lib/newlib.exp index e94534f6b..e6e9d660b 100644 --- a/newlib/testsuite/lib/newlib.exp +++ b/newlib/testsuite/lib/newlib.exp @@ -19,10 +19,10 @@ proc newlib_init { args } { global newlib_initialized global target_info global CFLAGS_FOR_TARGET - # These values are initialized in the local site.exp file + # These values are initialized in the local site.exp file. global srcdir objdir - global build_triplet host_triplet - # newlib_cflags comes from acinclude.m4, through the site.exp file + global host_triplet target_triplet + # newlib_cflags comes from acinclude.m4, through the site.exp file. global newlib_cflags global old_ld_library_path @@ -47,8 +47,8 @@ proc newlib_init { args } { } } - if [string match $build_triplet $host_triplet] then { - if [string match "i686-pc-linux-gnu" $build_triplet] then { + if [string match $host_triplet $target_triplet] then { + if [string match "i686-pc-linux-gnu" $host_triplet] then { set old_ld_library_path [getenv LD_LIBRARY_PATH] setenv LD_LIBRARY_PATH "$objdir/.libs" } @@ -58,8 +58,7 @@ proc newlib_init { args } { proc newlib_target_compile { source dest type options } { global gluefile wrap_flags global srcdir objdir - global build_triplet - global host_triplet + global host_triplet target_triplet verbose "In newlib_target_compile...\n" @@ -75,8 +74,8 @@ proc newlib_target_compile { source dest type options } { -L$objdir" } - if [string match $build_triplet $host_triplet] then { - if [string match "i686-pc-linux-gnu" $build_triplet] then { + if [string match $host_triplet $target_triplet] then { + if [string match "i686-pc-linux-gnu" $host_triplet] then { lappend options "libs=$objdir/crt0.o -lc" lappend options "ldflags=-nostdlib -L$objdir/.libs -lgcc" } @@ -87,12 +86,12 @@ proc newlib_target_compile { source dest type options } { proc newlib_finish { } { global old_ld_library_path - global build_triplet host_triplet + global host_triplet target_triplet verbose "In newlib_finish...\n" - if [string match $build_triplet $host_triplet] then { - if [string match "i686-pc-linux-gnu" $build_triplet] then { + if [string match $host_triplet $target_triplet] then { + if [string match "i686-pc-linux-gnu" $host_triplet] then { setenv LD_LIBRARY_PATH "$old_ld_library_path" } } |