diff --git a/Makefile.am b/Makefile.am index b6e579a6..3827b78f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -493,6 +493,8 @@ src_tools_linux_md2core_minidump_2_core_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing/gtest/include \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing +src_tools_linux_md2core_minidump_2_core_unittest_LDADD = \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) endif LINUX_HOST @@ -514,7 +516,8 @@ src_processor_binarystream_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing src_processor_binarystream_unittest_LDADD = \ - src/processor/binarystream.o + src/processor/binarystream.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_basic_source_line_resolver_unittest_SOURCES = \ src/processor/basic_source_line_resolver_unittest.cc \ @@ -532,7 +535,8 @@ src_processor_basic_source_line_resolver_unittest_LDADD = \ src/processor/pathname_stripper.o \ src/processor/logging.o \ src/processor/source_line_resolver_base.o \ - src/processor/tokenize.o + src/processor/tokenize.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_cfi_frame_info_unittest_SOURCES = \ src/processor/cfi_frame_info_unittest.cc \ @@ -542,7 +546,8 @@ src_processor_cfi_frame_info_unittest_SOURCES = \ src_processor_cfi_frame_info_unittest_LDADD = \ src/processor/cfi_frame_info.o \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_cfi_frame_info_unittest_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/testing/include \ @@ -588,7 +593,8 @@ src_processor_exploitability_unittest_LDADD = \ src/processor/stackwalker_sparc.o \ src/processor/stackwalker_x86.o \ src/processor/tokenize.o \ - src/third_party/libdisasm/libdisasm.a + src/third_party/libdisasm/libdisasm.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_disassembler_x86_unittest_SOURCES = \ src/processor/disassembler_x86_unittest.cc \ @@ -603,7 +609,8 @@ src_processor_disassembler_x86_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_disassembler_x86_unittest_LDADD = \ src/processor/disassembler_x86.o \ - src/third_party/libdisasm/libdisasm.a + src/third_party/libdisasm/libdisasm.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_fast_source_line_resolver_unittest_SOURCES = \ src/processor/fast_source_line_resolver_unittest.cc \ @@ -624,7 +631,8 @@ src_processor_fast_source_line_resolver_unittest_LDADD = \ src/processor/pathname_stripper.o \ src/processor/logging.o \ src/processor/source_line_resolver_base.o \ - src/processor/tokenize.o + src/processor/tokenize.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_map_serializers_unittest_SOURCES = \ src/processor/map_serializers_unittest.cc \ @@ -638,7 +646,8 @@ src_processor_map_serializers_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_map_serializers_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_minidump_processor_unittest_SOURCES = \ src/processor/minidump_processor_unittest.cc \ @@ -671,7 +680,8 @@ src_processor_minidump_processor_unittest_LDADD = \ src/processor/stackwalker_sparc.o \ src/processor/stackwalker_x86.o \ src/processor/tokenize.o \ - src/third_party/libdisasm/libdisasm.a + src/third_party/libdisasm/libdisasm.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_minidump_unittest_SOURCES = \ src/common/test_assembler.cc \ @@ -690,7 +700,8 @@ src_processor_minidump_unittest_LDADD = \ src/processor/basic_code_modules.o \ src/processor/logging.o \ src/processor/minidump.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_static_address_map_unittest_SOURCES = \ src/processor/static_address_map_unittest.cc \ @@ -704,7 +715,8 @@ src_processor_static_address_map_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_static_address_map_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_static_contained_range_map_unittest_SOURCES = \ src/processor/static_contained_range_map_unittest.cc \ @@ -718,7 +730,8 @@ src_processor_static_contained_range_map_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_static_contained_range_map_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_static_map_unittest_SOURCES = \ src/processor/static_map_unittest.cc \ @@ -732,7 +745,8 @@ src_processor_static_map_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_static_map_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_static_range_map_unittest_SOURCES = \ src/processor/static_range_map_unittest.cc \ @@ -746,24 +760,28 @@ src_processor_static_range_map_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing src_processor_static_range_map_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_pathname_stripper_unittest_SOURCES = \ src/processor/pathname_stripper_unittest.cc src_processor_pathname_stripper_unittest_LDADD = \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_postfix_evaluator_unittest_SOURCES = \ src/processor/postfix_evaluator_unittest.cc src_processor_postfix_evaluator_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_range_map_unittest_SOURCES = \ src/processor/range_map_unittest.cc src_processor_range_map_unittest_LDADD = \ src/processor/logging.o \ - src/processor/pathname_stripper.o + src/processor/pathname_stripper.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_stackwalker_selftest_SOURCES = \ src/processor/stackwalker_selftest.cc @@ -784,7 +802,8 @@ src_processor_stackwalker_selftest_LDADD = \ src/processor/stackwalker_ppc.o \ src/processor/stackwalker_sparc.o \ src/processor/stackwalker_x86.o \ - src/processor/tokenize.o + src/processor/tokenize.o \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_stackwalker_amd64_unittest_SOURCES = \ src/common/test_assembler.cc \ @@ -793,7 +812,8 @@ src_processor_stackwalker_amd64_unittest_SOURCES = \ src/testing/gtest/src/gtest_main.cc \ src/testing/src/gmock-all.cc src_processor_stackwalker_amd64_unittest_LDADD = \ - src/libbreakpad.a + src/libbreakpad.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_stackwalker_amd64_unittest_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/testing/include \ @@ -808,7 +828,8 @@ src_processor_stackwalker_arm_unittest_SOURCES = \ src/testing/gtest/src/gtest_main.cc \ src/testing/src/gmock-all.cc src_processor_stackwalker_arm_unittest_LDADD = \ - src/libbreakpad.a + src/libbreakpad.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_stackwalker_arm_unittest_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/testing/include \ @@ -823,7 +844,8 @@ src_processor_stackwalker_x86_unittest_SOURCES = \ src/testing/gtest/src/gtest_main.cc \ src/testing/src/gmock-all.cc src_processor_stackwalker_x86_unittest_LDADD = \ - src/libbreakpad.a + src/libbreakpad.a \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_processor_stackwalker_x86_unittest_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/testing/include \ @@ -846,6 +868,7 @@ src_processor_synth_minidump_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing/gtest/include \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing +src_processor_synth_minidump_unittest_LDADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) src_common_test_assembler_unittest_SOURCES = \ src/common/test_assembler.cc \ @@ -860,6 +883,7 @@ src_common_test_assembler_unittest_CPPFLAGS = \ -I$(top_srcdir)/src/testing/gtest/include \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing +src_common_test_assembler_unittest_LDADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) ## Non-installables noinst_PROGRAMS = diff --git a/Makefile.in b/Makefile.in index 46ff8302..17488dac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -581,7 +581,9 @@ am__src_common_test_assembler_unittest_SOURCES_DIST = \ @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT) src_common_test_assembler_unittest_OBJECTS = \ $(am_src_common_test_assembler_unittest_OBJECTS) -src_common_test_assembler_unittest_LDADD = $(LDADD) +@DISABLE_PROCESSOR_FALSE@src_common_test_assembler_unittest_DEPENDENCIES = \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_address_map_unittest_SOURCES_DIST = \ src/processor/address_map_unittest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_address_map_unittest_OBJECTS = src/processor/address_map_unittest.$(OBJEXT) @@ -603,7 +605,9 @@ src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_b @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_binarystream_unittest_SOURCES_DIST = \ src/processor/binarystream_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -614,7 +618,9 @@ am__src_processor_binarystream_unittest_SOURCES_DIST = \ src_processor_binarystream_unittest_OBJECTS = \ $(am_src_processor_binarystream_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_binarystream_unittest_DEPENDENCIES = \ -@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o +@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_cfi_frame_info_unittest_SOURCES_DIST = \ src/processor/cfi_frame_info_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -629,7 +635,9 @@ src_processor_cfi_frame_info_unittest_OBJECTS = \ @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_contained_range_map_unittest_SOURCES_DIST = \ src/processor/contained_range_map_unittest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_contained_range_map_unittest_OBJECTS = src/processor/contained_range_map_unittest.$(OBJEXT) @@ -651,7 +659,9 @@ src_processor_disassembler_x86_unittest_OBJECTS = \ $(am_src_processor_disassembler_x86_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_disassembler_x86_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_exploitability_unittest_SOURCES_DIST = \ src/processor/exploitability_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -684,7 +694,9 @@ src_processor_exploitability_unittest_OBJECTS = \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_fast_source_line_resolver_unittest_SOURCES_DIST = \ src/processor/fast_source_line_resolver_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -701,7 +713,9 @@ src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fa @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_map_serializers_unittest_SOURCES_DIST = \ src/processor/map_serializers_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -713,7 +727,9 @@ src_processor_map_serializers_unittest_OBJECTS = \ $(am_src_processor_map_serializers_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_map_serializers_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_minidump_dump_SOURCES_DIST = \ src/processor/minidump_dump.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_dump_OBJECTS = src/processor/minidump_dump.$(OBJEXT) @@ -754,7 +770,9 @@ src_processor_minidump_processor_unittest_OBJECTS = \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_minidump_stackwalk_SOURCES_DIST = \ src/processor/minidump_stackwalk.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_stackwalk_OBJECTS = src/processor/minidump_stackwalk.$(OBJEXT) @@ -803,14 +821,18 @@ src_processor_minidump_unittest_OBJECTS = \ @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/minidump.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_pathname_stripper_unittest_SOURCES_DIST = \ src/processor/pathname_stripper_unittest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_pathname_stripper_unittest_OBJECTS = src/processor/pathname_stripper_unittest.$(OBJEXT) src_processor_pathname_stripper_unittest_OBJECTS = \ $(am_src_processor_pathname_stripper_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_DEPENDENCIES = \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_postfix_evaluator_unittest_SOURCES_DIST = \ src/processor/postfix_evaluator_unittest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_postfix_evaluator_unittest_OBJECTS = src/processor/postfix_evaluator_unittest.$(OBJEXT) @@ -818,7 +840,9 @@ src_processor_postfix_evaluator_unittest_OBJECTS = \ $(am_src_processor_postfix_evaluator_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_range_map_unittest_SOURCES_DIST = \ src/processor/range_map_unittest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_range_map_unittest_OBJECTS = src/processor/range_map_unittest.$(OBJEXT) @@ -826,7 +850,9 @@ src_processor_range_map_unittest_OBJECTS = \ $(am_src_processor_range_map_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_stackwalker_amd64_unittest_SOURCES_DIST = \ src/common/test_assembler.cc \ src/processor/stackwalker_amd64_unittest.cc \ @@ -841,7 +867,9 @@ am__src_processor_stackwalker_amd64_unittest_SOURCES_DIST = \ src_processor_stackwalker_amd64_unittest_OBJECTS = \ $(am_src_processor_stackwalker_amd64_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_amd64_unittest_DEPENDENCIES = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_stackwalker_arm_unittest_SOURCES_DIST = \ src/common/test_assembler.cc \ src/processor/stackwalker_arm_unittest.cc \ @@ -856,7 +884,9 @@ am__src_processor_stackwalker_arm_unittest_SOURCES_DIST = \ src_processor_stackwalker_arm_unittest_OBJECTS = \ $(am_src_processor_stackwalker_arm_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_arm_unittest_DEPENDENCIES = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_stackwalker_selftest_SOURCES_DIST = \ src/processor/stackwalker_selftest.cc @DISABLE_PROCESSOR_FALSE@am_src_processor_stackwalker_selftest_OBJECTS = src/processor/stackwalker_selftest.$(OBJEXT) @@ -879,7 +909,9 @@ src_processor_stackwalker_selftest_OBJECTS = \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_stackwalker_x86_unittest_SOURCES_DIST = \ src/common/test_assembler.cc \ src/processor/stackwalker_x86_unittest.cc \ @@ -894,7 +926,9 @@ am__src_processor_stackwalker_x86_unittest_SOURCES_DIST = \ src_processor_stackwalker_x86_unittest_OBJECTS = \ $(am_src_processor_stackwalker_x86_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_x86_unittest_DEPENDENCIES = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_static_address_map_unittest_SOURCES_DIST = \ src/processor/static_address_map_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -906,7 +940,9 @@ src_processor_static_address_map_unittest_OBJECTS = \ $(am_src_processor_static_address_map_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_address_map_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_static_contained_range_map_unittest_SOURCES_DIST = \ src/processor/static_contained_range_map_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -917,7 +953,9 @@ am__src_processor_static_contained_range_map_unittest_SOURCES_DIST = \ src_processor_static_contained_range_map_unittest_OBJECTS = $(am_src_processor_static_contained_range_map_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_contained_range_map_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_static_map_unittest_SOURCES_DIST = \ src/processor/static_map_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -929,7 +967,9 @@ src_processor_static_map_unittest_OBJECTS = \ $(am_src_processor_static_map_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_map_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_static_range_map_unittest_SOURCES_DIST = \ src/processor/static_range_map_unittest.cc \ src/testing/gtest/src/gtest-all.cc \ @@ -941,7 +981,9 @@ src_processor_static_range_map_unittest_OBJECTS = \ $(am_src_processor_static_range_map_unittest_OBJECTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_range_map_unittest_DEPENDENCIES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_processor_synth_minidump_unittest_SOURCES_DIST = \ src/common/test_assembler.cc src/common/test_assembler.h \ src/processor/synth_minidump_unittest.cc \ @@ -957,7 +999,9 @@ am__src_processor_synth_minidump_unittest_SOURCES_DIST = \ @DISABLE_PROCESSOR_FALSE@ src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT) src_processor_synth_minidump_unittest_OBJECTS = \ $(am_src_processor_synth_minidump_unittest_OBJECTS) -src_processor_synth_minidump_unittest_LDADD = $(LDADD) +@DISABLE_PROCESSOR_FALSE@src_processor_synth_minidump_unittest_DEPENDENCIES = \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ +@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) am__src_tools_linux_core2md_core2md_SOURCES_DIST = \ src/tools/linux/core2md/core2md.cc \ src/client/linux/minidump_writer/linux_core_dumper.cc \ @@ -1022,7 +1066,8 @@ am__src_tools_linux_md2core_minidump_2_core_unittest_SOURCES_DIST = \ @LINUX_HOST_TRUE@ src/testing/src/src_tools_linux_md2core_minidump_2_core_unittest-gmock-all.$(OBJEXT) \ @LINUX_HOST_TRUE@ src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT) src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS = $(am_src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) -src_tools_linux_md2core_minidump_2_core_unittest_LDADD = $(LDADD) +@LINUX_HOST_TRUE@src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES = \ +@LINUX_HOST_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__src_tools_linux_symupload_minidump_upload_SOURCES_DIST = \ src/common/linux/http_upload.cc \ src/tools/linux/symupload/minidump_upload.cc @@ -1593,6 +1638,9 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @LINUX_HOST_TRUE@ -I$(top_srcdir)/src/testing/gtest \ @LINUX_HOST_TRUE@ -I$(top_srcdir)/src/testing +@LINUX_HOST_TRUE@src_tools_linux_md2core_minidump_2_core_unittest_LDADD = \ +@LINUX_HOST_TRUE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) + @DISABLE_PROCESSOR_FALSE@src_processor_address_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/address_map_unittest.cc @@ -1613,7 +1661,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing @DISABLE_PROCESSOR_FALSE@src_processor_binarystream_unittest_LDADD = \ -@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o +@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver_unittest.cc \ @@ -1633,7 +1682,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info_unittest.cc \ @@ -1644,7 +1694,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_CPPFLAGS = \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ @@ -1694,7 +1745,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_disassembler_x86_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86_unittest.cc \ @@ -1711,7 +1763,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_disassembler_x86_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver_unittest.cc \ @@ -1734,7 +1787,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_map_serializers_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/map_serializers_unittest.cc \ @@ -1750,7 +1804,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_map_serializers_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor_unittest.cc \ @@ -1785,7 +1840,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ -@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a +@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_minidump_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/common/test_assembler.cc \ @@ -1806,7 +1862,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/minidump.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_static_address_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/static_address_map_unittest.cc \ @@ -1822,7 +1879,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_address_map_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_static_contained_range_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/static_contained_range_map_unittest.cc \ @@ -1838,7 +1896,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_contained_range_map_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_static_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/static_map_unittest.cc \ @@ -1854,7 +1913,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_map_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_static_range_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/static_range_map_unittest.cc \ @@ -1870,27 +1930,31 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_static_range_map_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper_unittest.cc @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_LDADD = \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/postfix_evaluator_unittest.cc @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/range_map_unittest.cc @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_LDADD = \ @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o +@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_selftest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_selftest.cc @@ -1912,7 +1976,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \ -@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o +@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_amd64_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/common/test_assembler.cc \ @@ -1922,7 +1987,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_amd64_unittest_LDADD = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_amd64_unittest_CPPFLAGS = \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ @@ -1939,7 +2005,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_arm_unittest_LDADD = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_arm_unittest_CPPFLAGS = \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ @@ -1956,7 +2023,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_x86_unittest_LDADD = \ -@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a +@DISABLE_PROCESSOR_FALSE@ src/libbreakpad.a \ +@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_processor_stackwalker_x86_unittest_CPPFLAGS = \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ @@ -1982,6 +2050,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing +@DISABLE_PROCESSOR_FALSE@src_processor_synth_minidump_unittest_LDADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@src_common_test_assembler_unittest_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/common/test_assembler.cc \ @DISABLE_PROCESSOR_FALSE@ src/common/test_assembler.h \ @@ -1997,6 +2066,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing +@DISABLE_PROCESSOR_FALSE@src_common_test_assembler_unittest_LDADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @DISABLE_PROCESSOR_FALSE@noinst_SCRIPTS = $(check_SCRIPTS) @DISABLE_PROCESSOR_FALSE@src_processor_minidump_dump_SOURCES = \ @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_dump.cc diff --git a/src/common/stabs_reader_unittest.cc b/src/common/stabs_reader_unittest.cc index 35d5e6ca..edcba724 100644 --- a/src/common/stabs_reader_unittest.cc +++ b/src/common/stabs_reader_unittest.cc @@ -102,9 +102,9 @@ class StringAssembler: public Section { in_cu_ = true; } - + // Finish off the current CU's strings. - size_t EndCU() { + size_t EndCU() { assert(in_cu_); in_cu_ = false; return Size() - cu_start_; @@ -127,7 +127,7 @@ class StringAssembler: public Section { class StabsAssembler: public Section { public: // Create a StabsAssembler that uses StringAssembler for its strings. - StabsAssembler(StringAssembler *string_assembler) + StabsAssembler(StringAssembler *string_assembler) : Section(string_assembler->endianness()), string_assembler_(string_assembler), value_size_(0), @@ -188,7 +188,7 @@ class StabsAssembler: public Section { cu_header_ = NULL; return *this; } - + private: // Data used in a compilation unit header STAB that we won't know until // we've finished the compilation unit. @@ -265,19 +265,19 @@ TEST_F(Stabs, MockStabsInput) { stabs.set_value_size(4); stabs .Stab(N_SO, 149, 40232, 0x18a2a72bU, "builddir/") - .Stab(N_FUN, 83, 50010, 0x91a5353fU, + .Stab(N_FUN, 83, 50010, 0x91a5353fU, "not the SO with source file name we expected ") .Stab(N_SO, 165, 24791, 0xfe69d23cU, "") .Stab(N_SO, 184, 34178, 0xca4d883aU, "builddir1/") .Stab(N_SO, 83, 40859, 0xd2fe5df3U, "file1.c") .Stab(N_LSYM, 147, 39565, 0x60d4bb8aU, "not the FUN we're looking for") .Stab(N_FUN, 120, 50271, 0xa049f4b1U, "fun1") - .Stab(N_BINCL, 150, 15694, 0xef65c659U, + .Stab(N_BINCL, 150, 15694, 0xef65c659U, "something to ignore in a FUN body") .Stab(N_SLINE, 147, 4967, 0xd904b3f, "") .Stab(N_SOL, 177, 56135, 0xbd97b1dcU, "header.h") .Stab(N_SLINE, 130, 24610, 0x90f145b, "") - .Stab(N_FUN, 45, 32441, 0xbf27cf93U, + .Stab(N_FUN, 45, 32441, 0xbf27cf93U, "fun2:some stabs type info here:to trim from the name") .Stab(N_SLINE, 138, 39002, 0x8148b87, "") .Stab(N_SOL, 60, 49318, 0x1d06e025U, "file1.c") @@ -316,7 +316,7 @@ TEST_F(Stabs, MockStabsInput) { .WillOnce(Return(true)); EXPECT_CALL(mock_handler, EndCompilationUnit(0xd04b7448U)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, StartCompilationUnit(StrEq("file3.c"), + EXPECT_CALL(mock_handler, StartCompilationUnit(StrEq("file3.c"), 0x11759f10U, NULL)) .WillOnce(Return(true)); EXPECT_CALL(mock_handler, EndCompilationUnit(0x11cfe4b5U)) @@ -337,7 +337,7 @@ TEST_F(Stabs, AbruptCU) { EXPECT_CALL(mock_handler, StartCompilationUnit(StrEq("file2-1.c"), 0xbf10d5e4, NULL)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, EndCompilationUnit(NULL)) + EXPECT_CALL(mock_handler, EndCompilationUnit(0)) .WillOnce(Return(true)); } @@ -359,9 +359,9 @@ TEST_F(Stabs, AbruptFunction) { .WillOnce(Return(true)); EXPECT_CALL(mock_handler, StartFunction(StrEq("fun3_1"), 0xbbd4a145U)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, EndFunction(NULL)) + EXPECT_CALL(mock_handler, EndFunction(0)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, EndCompilationUnit(NULL)) + EXPECT_CALL(mock_handler, EndCompilationUnit(0)) .WillOnce(Return(true)); } @@ -394,12 +394,12 @@ TEST_F(Stabs, NoCUEnd) { EXPECT_CALL(mock_handler, StartCompilationUnit(StrEq("file5-1.c"), 0x2f7493c9U, NULL)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, EndCompilationUnit(NULL)) + EXPECT_CALL(mock_handler, EndCompilationUnit(0)) .WillOnce(Return(true)); EXPECT_CALL(mock_handler, StartCompilationUnit(StrEq("file5-2.c"), 0xf9f1d50fU, NULL)) .WillOnce(Return(true)); - EXPECT_CALL(mock_handler, EndCompilationUnit(NULL)) + EXPECT_CALL(mock_handler, EndCompilationUnit(0)) .WillOnce(Return(true)); } diff --git a/src/processor/disassembler_x86_unittest.cc b/src/processor/disassembler_x86_unittest.cc index b6884c1e..7d507ee9 100644 --- a/src/processor/disassembler_x86_unittest.cc +++ b/src/processor/disassembler_x86_unittest.cc @@ -92,41 +92,41 @@ unsigned char read_cmp[] = TEST(DisassemblerX86Test, SimpleReturnInstruction) { DisassemblerX86 dis(just_return, sizeof(just_return)-1, 0); EXPECT_EQ(1, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(true, dis.endOfBlock()); + EXPECT_TRUE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_controlflow, dis.currentInstructionGroup()); const libdis::x86_insn_t* instruction = dis.currentInstruction(); EXPECT_EQ(libdis::insn_controlflow, instruction->group); EXPECT_EQ(libdis::insn_return, instruction->type); EXPECT_EQ(0, dis.NextInstruction()); - EXPECT_EQ(false, dis.currentInstructionValid()); + EXPECT_FALSE(dis.currentInstructionValid()); EXPECT_EQ(NULL, dis.currentInstruction()); } TEST(DisassemblerX86Test, SimpleInvalidInstruction) { DisassemblerX86 dis(invalid_instruction, sizeof(invalid_instruction)-1, 0); EXPECT_EQ(0, dis.NextInstruction()); - EXPECT_EQ(false, dis.currentInstructionValid()); + EXPECT_FALSE(dis.currentInstructionValid()); } TEST(DisassemblerX86Test, BadReadLeadsToBranch) { DisassemblerX86 dis(read_eax_jmp_eax, sizeof(read_eax_jmp_eax)-1, 0); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadRead()); + EXPECT_TRUE(dis.setBadRead()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_logic, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_BRANCH_TARGET, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_controlflow, dis.currentInstructionGroup()); } @@ -134,111 +134,110 @@ TEST(DisassemblerX86Test, BadWriteLeadsToPushedArg) { DisassemblerX86 dis(write_eax_arg_to_call, sizeof(write_eax_arg_to_call)-1, 0); EXPECT_EQ(6, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadWrite()); + EXPECT_TRUE(dis.setBadWrite()); EXPECT_EQ(3, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_arithmetic, dis.currentInstructionGroup()); EXPECT_EQ(1, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(5, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_ARGUMENT_PASSED, dis.flags()); EXPECT_EQ(libdis::insn_controlflow, dis.currentInstructionGroup()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); } TEST(DisassemblerX86Test, BadReadLeadsToBlockWrite) { DisassemblerX86 dis(read_edi_stosb, sizeof(read_edi_stosb)-1, 0); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadRead()); + EXPECT_TRUE(dis.setBadRead()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_BLOCK_WRITE, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_string, dis.currentInstructionGroup()); } TEST(DisassemblerX86Test, BadReadClobberThenWrite) { DisassemblerX86 dis(read_clobber_write, sizeof(read_clobber_write)-1, 0); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_arithmetic, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadRead()); + EXPECT_TRUE(dis.setBadRead()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); } TEST(DisassemblerX86Test, BadReadXCHGThenWrite) { DisassemblerX86 dis(read_xchg_write, sizeof(read_xchg_write)-1, 0); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_arithmetic, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadRead()); + EXPECT_TRUE(dis.setBadRead()); EXPECT_EQ(1, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_WRITE, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_move, dis.currentInstructionGroup()); } TEST(DisassemblerX86Test, BadReadThenCMP) { DisassemblerX86 dis(read_cmp, sizeof(read_cmp)-1, 0); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(0, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_arithmetic, dis.currentInstructionGroup()); - EXPECT_EQ(true, dis.setBadRead()); + EXPECT_TRUE(dis.setBadRead()); EXPECT_EQ(3, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_COMPARISON, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_comparison, dis.currentInstructionGroup()); EXPECT_EQ(2, dis.NextInstruction()); - EXPECT_EQ(true, dis.currentInstructionValid()); + EXPECT_TRUE(dis.currentInstructionValid()); EXPECT_EQ(google_breakpad::DISX86_BAD_COMPARISON, dis.flags()); - EXPECT_EQ(false, dis.endOfBlock()); + EXPECT_FALSE(dis.endOfBlock()); EXPECT_EQ(libdis::insn_controlflow, dis.currentInstructionGroup()); } } -