From d3c273225cab70ad04df7c75aab6a62afbe99f47 Mon Sep 17 00:00:00 2001 From: echristo Date: Tue, 9 Mar 2004 01:53:28 +0000 Subject: [PATCH] 2004-03-08 Eric Christopher * Makefile.in (site.exp): Add libiconv variable definition. 2004-03-08 Eric Christopher * * lib/target-supports.exp: Enable libiconv in test compilation. Fix up error checking. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79148 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 +++++- gcc/Makefile.in | 21 +++++++++++---------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/target-supports.exp | 17 +++++++++++------ 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0325b82..9bce157 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-03-08 Eric Christopher + + * Makefile.in (site.exp): Add libiconv variable definition. + 2004-03-09 Hans-Peter Nilsson * configure: Regenerate for config/accross.m4 correction. @@ -45,7 +49,7 @@ and MASK_STRING. 2004-03-07 Aldy Hernandez - + * config/rs6000/rs6000.md (ashrdi3): Do not call ashrdi3_no_power for little endian. ("ashrdi3_no_power"): Disable for little endian. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 81c79e6..a3eb664 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -90,7 +90,7 @@ objdir = @objdir@ # Directory where sources are, from where we are. VPATH = @srcdir@ -# We define a vpath for the sources of the .texi files here because they +# We define a vpath for the sources of the .texi files here because they # are split between multiple directories and we would rather use one implicit # pattern rule for everything. # This vpath could be extended within the Make-lang fragments. @@ -1288,7 +1288,7 @@ gcc.srcextra: c-parse.y c-parse.c gengtype-lex.c gengtype-yacc.c gengtype-yacc.h -cp -p $^ $(srcdir) c-parse.c: c-parse.y - -$(BISON) $(BISONFLAGS) -o $@ $< + -$(BISON) $(BISONFLAGS) -o $@ $< c-parse.y: c-parse.in echo '/*WARNING: This file is automatically generated!*/' >tmp-c-parse.y @@ -2670,7 +2670,7 @@ TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi TEXI_CPPINT_FILES = cppinternals.texi -# The *.1, *.7, *.info, and *.dvi files are being generated from implicit +# The *.1, *.7, *.info, and *.dvi files are being generated from implicit # patterns. To use them, put each of the specific targets with its # specific dependencies but no build commands. @@ -2709,7 +2709,7 @@ doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7 -generated-manpages: man +generated-manpages: man man: $(MANFILES) lang.man @GENINSRC@ srcman lang.srcman @@ -2939,7 +2939,7 @@ install-common: native $(EXTRA_PARTS) lang.install-common installdirs fi $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME) -# Install the driver program as $(target_noncanonical)-gcc, +# Install the driver program as $(target_noncanonical)-gcc, # $(target_noncanonical)-gcc-$(version) # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. install-driver: installdirs xgcc$(exeext) @@ -3003,17 +3003,17 @@ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1 -rm -f $@ - -$(INSTALL_DATA) $< $@ + -$(INSTALL_DATA) $< $@ -chmod a-x $@ $(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext): doc/cpp.1 -rm -f $@ - -$(INSTALL_DATA) $< $@ + -$(INSTALL_DATA) $< $@ -chmod a-x $@ $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): doc/gcov.1 -rm -f $@ - -$(INSTALL_DATA) $< $@ + -$(INSTALL_DATA) $< $@ -chmod a-x $@ # Install the library. @@ -3165,6 +3165,7 @@ site.exp: ./config.status Makefile @echo "set build_triplet $(build)" >> ./tmp0 @echo "set target_triplet $(target)" >> ./tmp0 @echo "set target_alias $(target_noncanonical)" >> ./tmp0 + @echo "set libiconv \"$(LIBICONV)\"" >> ./tmp0 # CFLAGS is set even though it's empty to show we reserve the right to set it. @echo "set CFLAGS \"\"" >> ./tmp0 @echo "set CXXFLAGS \"\"" >> ./tmp0 @@ -3365,12 +3366,12 @@ STAGE2_FLAGS_TO_PASS = \ WERROR="@WERROR@" \ STAGEPROFILE_FLAGS_TO_PASS = \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" # Files never linked into the final executable produces warnings about missing # profile. STAGEFEEDBACK_FLAGS_TO_PASS = \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0193f0..77eb45c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-03-08 Eric Christopher + + * * lib/target-supports.exp: Enable libiconv in test + compilation. Fix up error checking. + 2004-03-08 Roger Sayle PR middle-end/14289 diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index ef29890..99b418e 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -216,6 +216,7 @@ proc check_profiling_available { test_what } { proc check_iconv_available { test_what } { global tool + global libiconv set result "" @@ -229,15 +230,19 @@ proc check_iconv_available { test_what } { puts $f "return 0;\n}" close $f - set lines [${tool}_target_compile "tmp.c" "tmp.x" executable ""] + set lines [${tool}_target_compile "tmp.c" "tmp.x" executable "libs=$libiconv" ] - set result [${tool}_load "./tmp.x" "" ""] - set status [lindex $result 0]; + if [string match "" $lines] then { + # No error messages, everything is OK. - verbose "status is <$status>" + set result [${tool}_load "./tmp.x" "" ""] + set status [lindex $result 0]; - if { $status == "pass" } then { - return 1 + verbose "status is <$status>" + + if { $status == "pass" } then { + return 1 + } } return 0 -- 2.7.4