This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [committed, PATCH] [gold] Replace two_file_shared_2.so with two_file_shared_1.so
- From: Cary Coutant <ccoutant at google dot com>
- To: "H.J. Lu" <hjl dot tools at gmail dot com>
- Cc: Binutils <binutils at sourceware dot org>
- Date: Mon, 9 Feb 2015 14:39:34 -0800
- Subject: Re: [committed, PATCH] [gold] Replace two_file_shared_2.so with two_file_shared_1.so
- Authentication-results: sourceware.org; auth=none
- References: <20150209133752 dot GA7078 at gmail dot com>
Thanks!
-cary
On Mon, Feb 9, 2015 at 5:37 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> There are
>
> two_file_shared_2_pic_1_test_LDADD = two_file_test_2_pic.o two_file_shared_1.so
>
> There should be two_file_shared_1.so, not two_file_shared_2.so in
> two_file_shared_2_pic_1_test_DEPENDENCIES. I checked it in.
>
> H.J.
> ---
> * testsuite/Makefile.am (two_file_shared_2_pic_1_test_DEPENDENCIES):
> Replace two_file_shared_2.so with two_file_shared_1.so.
> * testsuite/Makefile.in: Regenerated.
> ---
> gold/ChangeLog | 6 ++++++
> gold/testsuite/Makefile.am | 2 +-
> gold/testsuite/Makefile.in | 2 +-
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/gold/ChangeLog b/gold/ChangeLog
> index c920592..87900ad 100644
> --- a/gold/ChangeLog
> +++ b/gold/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-02-09 H.J. Lu <hongjiu.lu@intel.com>
> +
> + * testsuite/Makefile.am (two_file_shared_2_pic_1_test_DEPENDENCIES):
> + Replace two_file_shared_2.so with two_file_shared_1.so.
> + * testsuite/Makefile.in: Regenerated.
> +
> 2015-02-09 Alan Modra <amodra@gmail.com>
>
> * testsuite/Makefile.am (MOSTLYCLEANFILES): Add libweak_undef_2.a,
> diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
> index 4e2ce6b..f767c21 100644
> --- a/gold/testsuite/Makefile.am
> +++ b/gold/testsuite/Makefile.am
> @@ -472,7 +472,7 @@ two_file_shared_1_pic_2_test_LDADD = two_file_test_1_pic.o two_file_test_1b_pic.
>
> two_file_shared_2_pic_1_test_SOURCES = two_file_test_main.cc
> two_file_shared_2_pic_1_test_DEPENDENCIES = \
> - gcctestdir/ld two_file_shared_2.so two_file_test_2_pic.o
> + gcctestdir/ld two_file_shared_1.so two_file_test_2_pic.o
> two_file_shared_2_pic_1_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
> two_file_shared_2_pic_1_test_LDADD = two_file_test_2_pic.o two_file_shared_1.so
>
> diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
> index 6a3a05d..217e472 100644
> --- a/gold/testsuite/Makefile.in
> +++ b/gold/testsuite/Makefile.in
> @@ -2326,7 +2326,7 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \
> @GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_shared_1_pic_2_test_LDADD = two_file_test_1_pic.o two_file_test_1b_pic.o two_file_shared_2.so
> @GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_shared_2_pic_1_test_SOURCES = two_file_test_main.cc
> @GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_shared_2_pic_1_test_DEPENDENCIES = \
> -@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld two_file_shared_2.so two_file_test_2_pic.o
> +@GCC_TRUE@@NATIVE_LINKER_TRUE@ gcctestdir/ld two_file_shared_1.so two_file_test_2_pic.o
>
> @GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_shared_2_pic_1_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
> @GCC_TRUE@@NATIVE_LINKER_TRUE@two_file_shared_2_pic_1_test_LDADD = two_file_test_2_pic.o two_file_shared_1.so
> --
> 2.1.0
>