From af28fce3e5061a26dfec41ae3c0aa72ecf2c09c5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 29 Feb 2000 19:52:31 +0000 Subject: [PATCH] 2000-02-29 H.J. Lu * Makefile.am (check-DEJAGNU): Also pass LIBS="$(LIBS)". Set LC_COLLATE and LC_ALL to null and export them. It is for sort which expects the C locale. Add $(LIBS) to all $(HOSTING_LIBS). * Makefile.in: Rebuild. --- ld/ChangeLog | 8 ++++++++ ld/Makefile.am | 11 ++++++----- ld/Makefile.in | 11 ++++++----- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index dae6ea92dbe..a925a38d0c9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2000-02-29 H.J. Lu + + * Makefile.am (check-DEJAGNU): Also pass LIBS="$(LIBS)". + Set LC_COLLATE and LC_ALL to null and export them. It is for + sort which expects the C locale. + Add $(LIBS) to all $(HOSTING_LIBS). + * Makefile.in: Rebuild. + 2000-02-29 Alan Modra * emultempl/{aix.em, armcoff.em, armelf.em, armelf_oabi.em, diff --git a/ld/Makefile.am b/ld/Makefile.am index 38dbc52a404..84fa583345c 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -664,6 +664,7 @@ TESTBFDLIB = @TESTBFDLIB@ check-DEJAGNU: site.exp srcroot=`cd $(srcdir) && pwd`; export srcroot; \ r=`pwd`; export r; \ + LC_COLLATE=; LC_ALL=; export LC_COLLATE LC_ALL; \ EXPECT=$(EXPECT); export EXPECT; \ if [ -f $(top_builddir)/../expect/expect ]; then \ TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \ @@ -676,7 +677,7 @@ check-DEJAGNU: site.exp CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" \ + LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" LIBS="$(LIBS)" \ $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi @@ -688,16 +689,16 @@ check-DEJAGNU: site.exp ld-partial.o: ld-new$(EXEEXT) ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld-partial.o -r $(OFILES) ld1$(EXEEXT): ld-partial.o - ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1$(EXEEXT) $(HOSTING_CRT0) ld-partial.o $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1$(EXEEXT) $(HOSTING_CRT0) ld-partial.o $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld1-full$(EXEEXT): ld-new - ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1-full$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1-full$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld2$(EXEEXT): ld1$(EXEEXT) - ./ld1$(EXEEXT) $(HOSTING_EMU) -o ld2$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld1$(EXEEXT) $(HOSTING_EMU) -o ld2$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld3$(EXEEXT): ld2$(EXEEXT) - ./ld2$(EXEEXT) $(HOSTING_EMU) -o ld3$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld2$(EXEEXT) $(HOSTING_EMU) -o ld3$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) bootstrap: ld3$(EXEEXT) cmp ld2$(EXEEXT) ld3$(EXEEXT) diff --git a/ld/Makefile.in b/ld/Makefile.in index a0b5a2beff4..6ef6a0113f1 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1355,6 +1355,7 @@ $(EMULATION_OFILES): ../bfd/bfd.h sysdep.h config.h $(INCDIR)/bfdlink.h \ check-DEJAGNU: site.exp srcroot=`cd $(srcdir) && pwd`; export srcroot; \ r=`pwd`; export r; \ + LC_COLLATE=; LC_ALL=; export LC_COLLATE LC_ALL; \ EXPECT=$(EXPECT); export EXPECT; \ if [ -f $(top_builddir)/../expect/expect ]; then \ TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \ @@ -1367,7 +1368,7 @@ check-DEJAGNU: site.exp CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" \ + LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" LIBS="$(LIBS)" \ $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi @@ -1379,16 +1380,16 @@ check-DEJAGNU: site.exp ld-partial.o: ld-new$(EXEEXT) ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld-partial.o -r $(OFILES) ld1$(EXEEXT): ld-partial.o - ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1$(EXEEXT) $(HOSTING_CRT0) ld-partial.o $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1$(EXEEXT) $(HOSTING_CRT0) ld-partial.o $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld1-full$(EXEEXT): ld-new - ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1-full$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld-new$(EXEEXT) $(HOSTING_EMU) -o ld1-full$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld2$(EXEEXT): ld1$(EXEEXT) - ./ld1$(EXEEXT) $(HOSTING_EMU) -o ld2$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld1$(EXEEXT) $(HOSTING_EMU) -o ld2$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) ld3$(EXEEXT): ld2$(EXEEXT) - ./ld2$(EXEEXT) $(HOSTING_EMU) -o ld3$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) + ./ld2$(EXEEXT) $(HOSTING_EMU) -o ld3$(EXEEXT) $(HOSTING_CRT0) $(OFILES) $(TESTBFDLIB) $(LIBIBERTY) $(HOSTING_LIBS) $(LIBS) bootstrap: ld3$(EXEEXT) cmp ld2$(EXEEXT) ld3$(EXEEXT) -- 2.30.2