From aff326d7fffe9111be0900d433c6de6661c48af3 Mon Sep 17 00:00:00 2001 From: Rong Xu Date: Wed, 18 Feb 2015 11:19:21 -0800 Subject: [2.24][2.25] Fix race condition causing assert Backport trunk commit 635aa that fixes race condition causing assert in Eh_frame_hdr::do_sized_write(). 2014-09-23 Taiju Tsuiki Cary Coutant gold/ * gold.cc (queue_final_tasks): Add Write_sections_task as a * blocker on input_sections_blocker. * layout.cc (Write_sections_task::locks): Unblock input_sections_blocker_. * layout.h (Write_sections_task::Write_sections_task): Add input_sections_blocker. * testsuite/Makefile.am (exception_x86_64_bnd_test): Add * gcctestdir/ld to DEPENDENCIES. * testsuite/Makefile.in: Regenerate. Change-Id: I17a0f2aaf565b775f92f4806c4abcbea5d2dd803 --- binutils-2.25/gold/testsuite/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'binutils-2.25/gold/testsuite/Makefile.am') diff --git a/binutils-2.25/gold/testsuite/Makefile.am b/binutils-2.25/gold/testsuite/Makefile.am index 35cd0139..dd06d5fd 100644 --- a/binutils-2.25/gold/testsuite/Makefile.am +++ b/binutils-2.25/gold/testsuite/Makefile.am @@ -2380,9 +2380,10 @@ endif DEFAULT_TARGET_X86_64 if DEFAULT_TARGET_X86_64 check_PROGRAMS += exception_x86_64_bnd_test exception_x86_64_bnd_test_SOURCES = exception_test_main.cc -exception_x86_64_bnd_test_DEPENDENCIES = gcctestdir/ld exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o +exception_x86_64_bnd_test_DEPENDENCIES = exception_x86_64_bnd_1.o \ + exception_x86_64_bnd_2.o exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS) -exception_x86_64_bnd_test_LDADD = exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o +exception_x86_64_bnd_test_LDADD = $(exception_x86_64_bnd_test_DEPENDENCIES) exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as $(CXXCOMPILE) -c -fpic -Bgcctestdir/ -Wa,-madd-bnd-prefix -o $@ $< exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as -- cgit v1.2.3