* 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.
This commit is contained in:
Thomas Fitzsimmons 2002-04-30 22:38:07 +00:00
parent bfc27bae1a
commit 4cf4f010fb
4 changed files with 26 additions and 20 deletions

View File

@ -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> 2002-04-29 Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/io64.c (fstat64, lstat64): New syscalls added. * libc/sys/linux/io64.c (fstat64, lstat64): New syscalls added.

View File

@ -292,10 +292,8 @@ site.exp: Makefile
@echo 'set srcdir $(srcdir)/testsuite' >> $@-t @echo 'set srcdir $(srcdir)/testsuite' >> $@-t
@echo 'set objdir' `pwd` >> $@-t @echo 'set objdir' `pwd` >> $@-t
@echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t @echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t
@echo 'set build_alias $(build_alias)' >> $@-t @echo 'set host_alias $(build_alias)' >> $@-t
@echo 'set build_triplet $(build_triplet)' >> $@-t @echo 'set host_triplet $(build_triplet)' >> $@-t
@echo 'set host_alias $(host_alias)' >> $@-t
@echo 'set host_triplet $(host_triplet)' >> $@-t
@echo 'set target_alias $(host_alias)' >> $@-t @echo 'set target_alias $(host_alias)' >> $@-t
@echo 'set target_triplet $(host_triplet)' >> $@-t @echo 'set target_triplet $(host_triplet)' >> $@-t
@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t

View File

@ -805,10 +805,8 @@ site.exp: Makefile
@echo 'set srcdir $(srcdir)/testsuite' >> $@-t @echo 'set srcdir $(srcdir)/testsuite' >> $@-t
@echo 'set objdir' `pwd` >> $@-t @echo 'set objdir' `pwd` >> $@-t
@echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t @echo 'set newlib_cflags "$(NEWLIB_CFLAGS)"' >> $@-t
@echo 'set build_alias $(build_alias)' >> $@-t @echo 'set host_alias $(build_alias)' >> $@-t
@echo 'set build_triplet $(build_triplet)' >> $@-t @echo 'set host_triplet $(build_triplet)' >> $@-t
@echo 'set host_alias $(host_alias)' >> $@-t
@echo 'set host_triplet $(host_triplet)' >> $@-t
@echo 'set target_alias $(host_alias)' >> $@-t @echo 'set target_alias $(host_alias)' >> $@-t
@echo 'set target_triplet $(host_triplet)' >> $@-t @echo 'set target_triplet $(host_triplet)' >> $@-t
@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t

View File

@ -19,10 +19,10 @@ proc newlib_init { args } {
global newlib_initialized global newlib_initialized
global target_info global target_info
global CFLAGS_FOR_TARGET 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 srcdir objdir
global build_triplet host_triplet global host_triplet target_triplet
# newlib_cflags comes from acinclude.m4, through the site.exp file # newlib_cflags comes from acinclude.m4, through the site.exp file.
global newlib_cflags global newlib_cflags
global old_ld_library_path global old_ld_library_path
@ -47,8 +47,8 @@ proc newlib_init { args } {
} }
} }
if [string match $build_triplet $host_triplet] then { if [string match $host_triplet $target_triplet] then {
if [string match "i686-pc-linux-gnu" $build_triplet] then { if [string match "i686-pc-linux-gnu" $host_triplet] then {
set old_ld_library_path [getenv LD_LIBRARY_PATH] set old_ld_library_path [getenv LD_LIBRARY_PATH]
setenv LD_LIBRARY_PATH "$objdir/.libs" setenv LD_LIBRARY_PATH "$objdir/.libs"
} }
@ -58,8 +58,7 @@ proc newlib_init { args } {
proc newlib_target_compile { source dest type options } { proc newlib_target_compile { source dest type options } {
global gluefile wrap_flags global gluefile wrap_flags
global srcdir objdir global srcdir objdir
global build_triplet global host_triplet target_triplet
global host_triplet
verbose "In newlib_target_compile...\n" verbose "In newlib_target_compile...\n"
@ -75,8 +74,8 @@ proc newlib_target_compile { source dest type options } {
-L$objdir" -L$objdir"
} }
if [string match $build_triplet $host_triplet] then { if [string match $host_triplet $target_triplet] then {
if [string match "i686-pc-linux-gnu" $build_triplet] then { if [string match "i686-pc-linux-gnu" $host_triplet] then {
lappend options "libs=$objdir/crt0.o -lc" lappend options "libs=$objdir/crt0.o -lc"
lappend options "ldflags=-nostdlib -L$objdir/.libs -lgcc" lappend options "ldflags=-nostdlib -L$objdir/.libs -lgcc"
} }
@ -87,12 +86,12 @@ proc newlib_target_compile { source dest type options } {
proc newlib_finish { } { proc newlib_finish { } {
global old_ld_library_path global old_ld_library_path
global build_triplet host_triplet global host_triplet target_triplet
verbose "In newlib_finish...\n" verbose "In newlib_finish...\n"
if [string match $build_triplet $host_triplet] then { if [string match $host_triplet $target_triplet] then {
if [string match "i686-pc-linux-gnu" $build_triplet] then { if [string match "i686-pc-linux-gnu" $host_triplet] then {
setenv LD_LIBRARY_PATH "$old_ld_library_path" setenv LD_LIBRARY_PATH "$old_ld_library_path"
} }
} }