diff options
| -rw-r--r-- | gold/ChangeLog | 16 | ||||
| -rw-r--r-- | gold/Makefile.in | 11 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 13 | ||||
| -rw-r--r-- | gold/testsuite/script_test_2.cc | 2 | ||||
| -rw-r--r-- | gold/testsuite/script_test_2a.cc | 2 |
6 files changed, 36 insertions, 10 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 5916d05..9bb3c20 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,13 @@ +2008-04-11 Ian Lance Taylor <iant@google.com> + + * testsuite/Makefile.am (justsyms_2r.o): Add dependency on + justsyms.t. + * testsuite/Makefile.in: Rebuild. + + * testsuite/script_test_2a.cc (script_test_string_a): Make 8 bytes + long. + * testsuite/script_test_2.cc (main): Adjust test. + 2008-04-11 David S. Miller <davem@davemloft.net> Ian Lance Taylor <iant@google.com> @@ -11,8 +21,10 @@ * testsuite/justsyms.t: Start at 0x100. * testsuite/justsyms_1.cc: Adjust justsyms_string assertion. - * script_test_2b.cc (script_test_string_b): Make 8 bytes long. - * script_test_2.cc: Adjust string and section length checks. + * testsuite/script_test_2b.cc (script_test_string_b): Make 8 bytes + long. + * testsuite/script_test_2.cc: Adjust string and section length + checks. 2008-04-09 Ian Lance Taylor <iant@google.com> diff --git a/gold/Makefile.in b/gold/Makefile.in index 66e994a..03f4c0d 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -186,6 +186,7 @@ GCC_FALSE = @GCC_FALSE@ GCC_TRUE = @GCC_TRUE@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INCINTL = @INCINTL@ @@ -238,10 +239,9 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ +YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -258,23 +258,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index a27166e..cec5412 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -664,7 +664,7 @@ justsyms_DEPENDENCIES = gcctestdir/ld justsyms_2r.o justsyms_LDFLAGS = -Bgcctestdir/ -Wl,-R,justsyms_2r.o justsyms_2.o: justsyms_2.cc $(CXXCOMPILE) -c -o $@ $< -justsyms_2r.o: justsyms_2.o gcctestdir/ld +justsyms_2r.o: justsyms_2.o gcctestdir/ld $(srcdir)/justsyms.t gcctestdir/ld -o $@ -r -T $(srcdir)/justsyms.t justsyms_2.o check_PROGRAMS += binary_test diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 90f6d9e..0666360 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -797,6 +797,7 @@ GCC_FALSE = @GCC_FALSE@ GCC_TRUE = @GCC_TRUE@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INCINTL = @INCINTL@ @@ -849,10 +850,9 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ +YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -869,23 +869,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -1956,7 +1963,7 @@ uninstall-am: uninstall-info-am @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -s $< >$@ 2>/dev/null @GCC_TRUE@@NATIVE_LINKER_TRUE@justsyms_2.o: justsyms_2.cc @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -o $@ $< -@GCC_TRUE@@NATIVE_LINKER_TRUE@justsyms_2r.o: justsyms_2.o gcctestdir/ld +@GCC_TRUE@@NATIVE_LINKER_TRUE@justsyms_2r.o: justsyms_2.o gcctestdir/ld $(srcdir)/justsyms.t @GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld -o $@ -r -T $(srcdir)/justsyms.t justsyms_2.o # Copy the file to the build directory to avoid worrying about the # full pathname in the generated symbols. diff --git a/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc index 6e7e000..9ba3aad 100644 --- a/gold/testsuite/script_test_2.cc +++ b/gold/testsuite/script_test_2.cc @@ -51,7 +51,7 @@ main(int, char**) // Next the string from script_test_2a.o, after the subalign. for (int i = 16 + 7; i < 48; ++i) assert(start_test_area_1[i] == 0); - assert(strcmp(start_test_area_1 + 48, "test a") == 0); + assert(strcmp(start_test_area_1 + 48, "test aa") == 0); // Move four bytes forward to start_data. assert(reinterpret_cast<uintptr_t>(start_test_area_1 + 48 + 8 + 4) diff --git a/gold/testsuite/script_test_2a.cc b/gold/testsuite/script_test_2a.cc index f4a611c..6c665eb 100644 --- a/gold/testsuite/script_test_2a.cc +++ b/gold/testsuite/script_test_2a.cc @@ -21,4 +21,4 @@ // MA 02110-1301, USA. char script_test_string_a[] __attribute__ ((section(".gold_test"))) = - "test a"; + "test aa"; |