michael@0: # HG changeset patch michael@0: # User Ted Mielczarek michael@0: # Date 1360255133 18000 michael@0: # Node ID d23a69a6c34a1f1c21e241f37b388c8689f2386b michael@0: # Parent c3b1109dd392c16a9fe4e85da693010966dbbf0b michael@0: Change the representation of CFI rules to avoid postfix expressions in most cases michael@0: Patch by Julian Seward michael@0: R=ted michael@0: michael@0: diff --git a/Makefile.am b/Makefile.am michael@0: --- a/Makefile.am michael@0: +++ b/Makefile.am michael@0: @@ -133,16 +133,17 @@ michael@0: src/google_breakpad/processor/source_line_resolver_base.h \ michael@0: src/google_breakpad/processor/source_line_resolver_interface.h \ michael@0: src/google_breakpad/processor/stack_frame.h \ michael@0: src/google_breakpad/processor/stack_frame_cpu.h \ michael@0: src/google_breakpad/processor/stack_frame_symbolizer.h \ michael@0: src/google_breakpad/processor/stackwalker.h \ michael@0: src/google_breakpad/processor/symbol_supplier.h \ michael@0: src/google_breakpad/processor/system_info.h \ michael@0: + src/common/module.cc \ michael@0: src/processor/address_map-inl.h \ michael@0: src/processor/address_map.h \ michael@0: src/processor/basic_code_module.h \ michael@0: src/processor/basic_code_modules.cc \ michael@0: src/processor/basic_code_modules.h \ michael@0: src/processor/basic_source_line_resolver_types.h \ michael@0: src/processor/basic_source_line_resolver.cc \ michael@0: src/processor/binarystream.h \ michael@0: @@ -555,30 +556,32 @@ michael@0: src/testing/src/gmock-all.cc michael@0: src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \ michael@0: -I$(top_srcdir)/src \ michael@0: -I$(top_srcdir)/src/testing/include \ michael@0: -I$(top_srcdir)/src/testing/gtest/include \ michael@0: -I$(top_srcdir)/src/testing/gtest \ michael@0: -I$(top_srcdir)/src/testing michael@0: src_processor_basic_source_line_resolver_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/basic_source_line_resolver.o \ michael@0: src/processor/cfi_frame_info.o \ michael@0: src/processor/pathname_stripper.o \ michael@0: src/processor/logging.o \ michael@0: src/processor/source_line_resolver_base.o \ michael@0: src/processor/tokenize.o \ michael@0: $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: src_processor_cfi_frame_info_unittest_SOURCES = \ michael@0: src/processor/cfi_frame_info_unittest.cc \ michael@0: src/testing/gtest/src/gtest-all.cc \ michael@0: src/testing/gtest/src/gtest_main.cc \ michael@0: src/testing/src/gmock-all.cc michael@0: src_processor_cfi_frame_info_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/cfi_frame_info.o \ michael@0: src/processor/logging.o \ michael@0: src/processor/pathname_stripper.o \ michael@0: $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: src_processor_cfi_frame_info_unittest_CPPFLAGS = \ michael@0: -I$(top_srcdir)/src \ michael@0: -I$(top_srcdir)/src/testing/include \ michael@0: -I$(top_srcdir)/src/testing/gtest/include \ michael@0: @@ -598,16 +601,17 @@ michael@0: src/testing/src/gmock-all.cc michael@0: src_processor_exploitability_unittest_CPPFLAGS = \ michael@0: -I$(top_srcdir)/src \ michael@0: -I$(top_srcdir)/src/testing/include \ michael@0: -I$(top_srcdir)/src/testing/gtest/include \ michael@0: -I$(top_srcdir)/src/testing/gtest \ michael@0: -I$(top_srcdir)/src/testing michael@0: src_processor_exploitability_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/minidump_processor.o \ michael@0: src/processor/process_state.o \ michael@0: src/processor/disassembler_x86.o \ michael@0: src/processor/exploitability.o \ michael@0: src/processor/exploitability_win.o \ michael@0: src/processor/basic_code_modules.o \ michael@0: src/processor/basic_source_line_resolver.o \ michael@0: src/processor/call_stack.o \ michael@0: @@ -649,16 +653,17 @@ michael@0: src/testing/src/gmock-all.cc michael@0: src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \ michael@0: -I$(top_srcdir)/src \ michael@0: -I$(top_srcdir)/src/testing/include \ michael@0: -I$(top_srcdir)/src/testing/gtest/include \ michael@0: -I$(top_srcdir)/src/testing/gtest \ michael@0: -I$(top_srcdir)/src/testing michael@0: src_processor_fast_source_line_resolver_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/fast_source_line_resolver.o \ michael@0: src/processor/basic_source_line_resolver.o \ michael@0: src/processor/cfi_frame_info.o \ michael@0: src/processor/module_comparer.o \ michael@0: src/processor/module_serializer.o \ michael@0: src/processor/pathname_stripper.o \ michael@0: src/processor/logging.o \ michael@0: src/processor/source_line_resolver_base.o \ michael@0: @@ -686,16 +691,17 @@ michael@0: src/testing/src/gmock-all.cc michael@0: src_processor_minidump_processor_unittest_CPPFLAGS = \ michael@0: -I$(top_srcdir)/src \ michael@0: -I$(top_srcdir)/src/testing/include \ michael@0: -I$(top_srcdir)/src/testing/gtest/include \ michael@0: -I$(top_srcdir)/src/testing/gtest \ michael@0: -I$(top_srcdir)/src/testing michael@0: src_processor_minidump_processor_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/basic_code_modules.o \ michael@0: src/processor/basic_source_line_resolver.o \ michael@0: src/processor/call_stack.o \ michael@0: src/processor/cfi_frame_info.o \ michael@0: src/processor/disassembler_x86.o \ michael@0: src/processor/exploitability.o \ michael@0: src/processor/exploitability_win.o \ michael@0: src/processor/logging.o \ michael@0: @@ -799,16 +805,17 @@ michael@0: src/processor/pathname_stripper_unittest.cc michael@0: src_processor_pathname_stripper_unittest_LDADD = \ michael@0: src/processor/pathname_stripper.o \ michael@0: $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: src_processor_postfix_evaluator_unittest_SOURCES = \ michael@0: src/processor/postfix_evaluator_unittest.cc michael@0: src_processor_postfix_evaluator_unittest_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/logging.o \ michael@0: src/processor/pathname_stripper.o \ michael@0: $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: src_processor_range_map_unittest_SOURCES = \ michael@0: src/processor/range_map_unittest.cc michael@0: src_processor_range_map_unittest_LDADD = \ michael@0: src/processor/logging.o \ michael@0: @@ -928,16 +935,17 @@ michael@0: src/processor/basic_code_modules.o \ michael@0: src/processor/logging.o \ michael@0: src/processor/minidump.o \ michael@0: src/processor/pathname_stripper.o michael@0: michael@0: src_processor_minidump_stackwalk_SOURCES = \ michael@0: src/processor/minidump_stackwalk.cc michael@0: src_processor_minidump_stackwalk_LDADD = \ michael@0: + src/common/module.o \ michael@0: src/processor/basic_code_modules.o \ michael@0: src/processor/basic_source_line_resolver.o \ michael@0: src/processor/binarystream.o \ michael@0: src/processor/call_stack.o \ michael@0: src/processor/cfi_frame_info.o \ michael@0: src/processor/disassembler_x86.o \ michael@0: src/processor/exploitability.o \ michael@0: src/processor/exploitability_win.o \ michael@0: diff --git a/Makefile.in b/Makefile.in michael@0: --- a/Makefile.in michael@0: +++ b/Makefile.in michael@0: @@ -1,14 +1,14 @@ michael@0: -# Makefile.in generated by automake 1.11.1 from Makefile.am. michael@0: +# Makefile.in generated by automake 1.11.3 from Makefile.am. michael@0: # @configure_input@ michael@0: michael@0: # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, michael@0: -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, michael@0: -# Inc. michael@0: +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software michael@0: +# Foundation, Inc. michael@0: # This Makefile.in is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: # This program is distributed in the hope that it will be useful, michael@0: # but WITHOUT ANY WARRANTY, to the extent permitted by law; without michael@0: # even the implied warranty of MERCHANTABILITY or FITNESS FOR A michael@0: # PARTICULAR PURPOSE. michael@0: @@ -190,16 +190,22 @@ michael@0: sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ michael@0: $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ michael@0: if (++n[$$2] == $(am__install_max)) \ michael@0: { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ michael@0: END { for (dir in files) print dir, files[dir] }' michael@0: am__base_list = \ michael@0: sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ michael@0: sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' michael@0: +am__uninstall_files_from_dir = { \ michael@0: + test -z "$$files" \ michael@0: + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ michael@0: + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ michael@0: + $(am__cd) "$$dir" && rm -f $$files; }; \ michael@0: + } michael@0: am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ michael@0: "$(DESTDIR)$(docdir)" michael@0: LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES) michael@0: AR = ar michael@0: ARFLAGS = cru michael@0: src_client_linux_libbreakpad_client_a_AR = $(AR) $(ARFLAGS) michael@0: src_client_linux_libbreakpad_client_a_LIBADD = michael@0: am__src_client_linux_libbreakpad_client_a_SOURCES_DIST = \ michael@0: @@ -261,18 +267,18 @@ michael@0: src/google_breakpad/processor/source_line_resolver_base.h \ michael@0: src/google_breakpad/processor/source_line_resolver_interface.h \ michael@0: src/google_breakpad/processor/stack_frame.h \ michael@0: src/google_breakpad/processor/stack_frame_cpu.h \ michael@0: src/google_breakpad/processor/stack_frame_symbolizer.h \ michael@0: src/google_breakpad/processor/stackwalker.h \ michael@0: src/google_breakpad/processor/symbol_supplier.h \ michael@0: src/google_breakpad/processor/system_info.h \ michael@0: - src/processor/address_map-inl.h src/processor/address_map.h \ michael@0: - src/processor/basic_code_module.h \ michael@0: + src/common/module.cc src/processor/address_map-inl.h \ michael@0: + src/processor/address_map.h src/processor/basic_code_module.h \ michael@0: src/processor/basic_code_modules.cc \ michael@0: src/processor/basic_code_modules.h \ michael@0: src/processor/basic_source_line_resolver_types.h \ michael@0: src/processor/basic_source_line_resolver.cc \ michael@0: src/processor/binarystream.h src/processor/binarystream.cc \ michael@0: src/processor/call_stack.cc src/processor/cfi_frame_info.cc \ michael@0: src/processor/cfi_frame_info.h \ michael@0: src/processor/contained_range_map-inl.h \ michael@0: @@ -322,17 +328,19 @@ michael@0: src/processor/static_contained_range_map-inl.h \ michael@0: src/processor/static_contained_range_map.h \ michael@0: src/processor/static_map_iterator-inl.h \ michael@0: src/processor/static_map_iterator.h \ michael@0: src/processor/static_map-inl.h src/processor/static_map.h \ michael@0: src/processor/static_range_map-inl.h \ michael@0: src/processor/static_range_map.h src/processor/tokenize.cc \ michael@0: src/processor/tokenize.h michael@0: -@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \ michael@0: +@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.$(OBJEXT) \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.$(OBJEXT) \ michael@0: @@ -620,17 +628,19 @@ michael@0: am__src_processor_basic_source_line_resolver_unittest_SOURCES_DIST = \ michael@0: src/processor/basic_source_line_resolver_unittest.cc \ michael@0: src/testing/gtest/src/gtest-all.cc \ michael@0: src/testing/src/gmock-all.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_basic_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT) michael@0: src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_basic_source_line_resolver_unittest_OBJECTS) michael@0: -@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = src/processor/basic_source_line_resolver.o \ michael@0: +@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) michael@0: am__src_processor_binarystream_unittest_SOURCES_DIST = \ michael@0: @@ -653,16 +663,17 @@ michael@0: src/testing/src/gmock-all.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_cfi_frame_info_unittest_OBJECTS = src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT) michael@0: src_processor_cfi_frame_info_unittest_OBJECTS = \ michael@0: $(am_src_processor_cfi_frame_info_unittest_OBJECTS) michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) michael@0: am__src_processor_contained_range_map_unittest_SOURCES_DIST = \ michael@0: src/processor/contained_range_map_unittest.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_contained_range_map_unittest_OBJECTS = src/processor/contained_range_map_unittest.$(OBJEXT) michael@0: @@ -694,16 +705,17 @@ michael@0: src/testing/src/gmock-all.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_exploitability_unittest_OBJECTS = src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT) michael@0: src_processor_exploitability_unittest_OBJECTS = \ michael@0: $(am_src_processor_exploitability_unittest_OBJECTS) michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @@ -726,17 +738,19 @@ michael@0: am__src_processor_fast_source_line_resolver_unittest_SOURCES_DIST = \ michael@0: src/processor/fast_source_line_resolver_unittest.cc \ michael@0: src/testing/gtest/src/gtest-all.cc \ michael@0: src/testing/src/gmock-all.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_fast_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT) michael@0: src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS) michael@0: -@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = src/processor/fast_source_line_resolver.o \ michael@0: +@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/module_comparer.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/module_serializer.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ michael@0: @@ -771,16 +785,17 @@ michael@0: src/testing/gtest/src/gtest-all.cc \ michael@0: src/testing/src/gmock-all.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT) michael@0: src_processor_minidump_processor_unittest_OBJECTS = \ michael@0: $(am_src_processor_minidump_processor_unittest_OBJECTS) michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @@ -801,16 +816,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) michael@0: am__src_processor_minidump_stackwalk_SOURCES_DIST = \ michael@0: src/processor/minidump_stackwalk.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_stackwalk_OBJECTS = src/processor/minidump_stackwalk.$(OBJEXT) michael@0: src_processor_minidump_stackwalk_OBJECTS = \ michael@0: $(am_src_processor_minidump_stackwalk_OBJECTS) michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @@ -862,16 +878,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) michael@0: am__src_processor_postfix_evaluator_unittest_SOURCES_DIST = \ michael@0: src/processor/postfix_evaluator_unittest.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_postfix_evaluator_unittest_OBJECTS = src/processor/postfix_evaluator_unittest.$(OBJEXT) michael@0: src_processor_postfix_evaluator_unittest_OBJECTS = \ michael@0: $(am_src_processor_postfix_evaluator_unittest_OBJECTS) michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) michael@0: am__src_processor_range_map_unittest_SOURCES_DIST = \ michael@0: src/processor/range_map_unittest.cc michael@0: @DISABLE_PROCESSOR_FALSE@am_src_processor_range_map_unittest_OBJECTS = src/processor/range_map_unittest.$(OBJEXT) michael@0: src_processor_range_map_unittest_OBJECTS = \ michael@0: @@ -1212,22 +1229,26 @@ michael@0: ETAGS = etags michael@0: CTAGS = ctags michael@0: am__tty_colors = \ michael@0: red=; grn=; lgn=; blu=; std= michael@0: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) michael@0: distdir = $(PACKAGE)-$(VERSION) michael@0: top_distdir = $(distdir) michael@0: am__remove_distdir = \ michael@0: - { test ! -d "$(distdir)" \ michael@0: - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ michael@0: - && rm -fr "$(distdir)"; }; } michael@0: + if test -d "$(distdir)"; then \ michael@0: + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ michael@0: + && rm -rf "$(distdir)" \ michael@0: + || { sleep 5 && rm -rf "$(distdir)"; }; \ michael@0: + else :; fi michael@0: DIST_ARCHIVES = $(distdir).tar.gz michael@0: GZIP_ENV = --best michael@0: distuninstallcheck_listfiles = find . -type f -print michael@0: +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ michael@0: + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' michael@0: distcleancheck_listfiles = find . -type f -print michael@0: ACLOCAL = @ACLOCAL@ michael@0: AMTAR = @AMTAR@ michael@0: AUTOCONF = @AUTOCONF@ michael@0: AUTOHEADER = @AUTOHEADER@ michael@0: AUTOMAKE = @AUTOMAKE@ michael@0: AWK = @AWK@ michael@0: CC = @CC@ michael@0: @@ -1383,16 +1404,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/source_line_resolver_base.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/source_line_resolver_interface.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame_cpu.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame_symbolizer.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stackwalker.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/symbol_supplier.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/system_info.h \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/address_map-inl.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/address_map.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_module.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver_types.h \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.h \ michael@0: @@ -1715,31 +1737,33 @@ michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_SOURCES = \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info_unittest.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/gtest-all.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/gtest_main.cc \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_CPPFLAGS = \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ michael@0: @@ -1763,16 +1787,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_CPPFLAGS = \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @@ -1818,16 +1843,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/module_comparer.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/module_serializer.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ michael@0: @@ -1859,16 +1885,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_CPPFLAGS = \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ michael@0: @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @@ -1984,16 +2011,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_LDADD = \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_SOURCES = \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/postfix_evaluator_unittest.cc michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_SOURCES = \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/range_map_unittest.cc michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_LDADD = \ michael@0: @@ -2122,16 +2150,17 @@ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/minidump.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_SOURCES = \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_stackwalk.cc michael@0: michael@0: @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_LDADD = \ michael@0: +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ michael@0: @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ michael@0: @@ -2289,17 +2318,17 @@ michael@0: src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \ michael@0: src/tools/windows/symupload/symupload.cc \ michael@0: src/tools/windows/symupload/symupload.vcproj michael@0: michael@0: all: all-am michael@0: michael@0: .SUFFIXES: michael@0: .SUFFIXES: .S .c .cc .o .obj michael@0: -am--refresh: michael@0: +am--refresh: Makefile michael@0: @: michael@0: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) michael@0: @for dep in $?; do \ michael@0: case '$(am__configure_deps)' in \ michael@0: *$$dep*) \ michael@0: echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ michael@0: $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ michael@0: && exit 0; \ michael@0: @@ -2325,20 +2354,18 @@ michael@0: michael@0: $(top_srcdir)/configure: $(am__configure_deps) michael@0: $(am__cd) $(srcdir) && $(AUTOCONF) michael@0: $(ACLOCAL_M4): $(am__aclocal_m4_deps) michael@0: $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) michael@0: $(am__aclocal_m4_deps): michael@0: michael@0: src/config.h: src/stamp-h1 michael@0: - @if test ! -f $@; then \ michael@0: - rm -f src/stamp-h1; \ michael@0: - $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \ michael@0: - else :; fi michael@0: + @if test ! -f $@; then rm -f src/stamp-h1; else :; fi michael@0: + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi michael@0: michael@0: src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status michael@0: @rm -f src/stamp-h1 michael@0: cd $(top_builddir) && $(SHELL) ./config.status src/config.h michael@0: $(top_srcdir)/src/config.h.in: $(am__configure_deps) michael@0: ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) michael@0: rm -f src/stamp-h1 michael@0: touch $@ michael@0: @@ -2366,19 +2393,17 @@ michael@0: ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \ michael@0: else :; fi; \ michael@0: done michael@0: michael@0: uninstall-libLIBRARIES: michael@0: @$(NORMAL_UNINSTALL) michael@0: @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \ michael@0: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ michael@0: - test -n "$$files" || exit 0; \ michael@0: - echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \ michael@0: - cd "$(DESTDIR)$(libdir)" && rm -f $$files michael@0: + dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir) michael@0: michael@0: clean-libLIBRARIES: michael@0: -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) michael@0: michael@0: clean-noinstLIBRARIES: michael@0: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) michael@0: src/client/linux/crash_generation/$(am__dirstamp): michael@0: @$(MKDIR_P) src/client/linux/crash_generation michael@0: @@ -2477,20 +2502,22 @@ michael@0: @$(MKDIR_P) src/common/android/$(DEPDIR) michael@0: @: > src/common/android/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/android/breakpad_getcontext.$(OBJEXT): \ michael@0: src/common/android/$(am__dirstamp) \ michael@0: src/common/android/$(DEPDIR)/$(am__dirstamp) michael@0: src/client/linux/$(am__dirstamp): michael@0: @$(MKDIR_P) src/client/linux michael@0: @: > src/client/linux/$(am__dirstamp) michael@0: -src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: +src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) $(EXTRA_src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: -rm -f src/client/linux/libbreakpad_client.a michael@0: $(src_client_linux_libbreakpad_client_a_AR) src/client/linux/libbreakpad_client.a $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_LIBADD) michael@0: $(RANLIB) src/client/linux/libbreakpad_client.a michael@0: +src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: + src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/$(am__dirstamp): michael@0: @$(MKDIR_P) src/processor michael@0: @: > src/processor/$(am__dirstamp) michael@0: src/processor/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/processor/$(DEPDIR) michael@0: @: > src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/basic_code_modules.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: @@ -2559,17 +2586,17 @@ michael@0: src/processor/stackwalker_x86.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/$(am__dirstamp): michael@0: @$(MKDIR_P) src michael@0: @: > src/$(am__dirstamp) michael@0: -src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp) michael@0: +src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) $(EXTRA_src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp) michael@0: -rm -f src/libbreakpad.a michael@0: $(src_libbreakpad_a_AR) src/libbreakpad.a $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_LIBADD) michael@0: $(RANLIB) src/libbreakpad.a michael@0: src/third_party/libdisasm/$(am__dirstamp): michael@0: @$(MKDIR_P) src/third_party/libdisasm michael@0: @: > src/third_party/libdisasm/$(am__dirstamp) michael@0: src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/third_party/libdisasm/$(DEPDIR) michael@0: @@ -2611,17 +2638,17 @@ michael@0: src/third_party/libdisasm/$(am__dirstamp) \ michael@0: src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) michael@0: src/third_party/libdisasm/x86_misc.$(OBJEXT): \ michael@0: src/third_party/libdisasm/$(am__dirstamp) \ michael@0: src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) michael@0: src/third_party/libdisasm/x86_operand_list.$(OBJEXT): \ michael@0: src/third_party/libdisasm/$(am__dirstamp) \ michael@0: src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) michael@0: -src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp) michael@0: +src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) $(EXTRA_src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp) michael@0: -rm -f src/third_party/libdisasm/libdisasm.a michael@0: $(src_third_party_libdisasm_libdisasm_a_AR) src/third_party/libdisasm/libdisasm.a $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_LIBADD) michael@0: $(RANLIB) src/third_party/libdisasm/libdisasm.a michael@0: install-binPROGRAMS: $(bin_PROGRAMS) michael@0: @$(NORMAL_INSTALL) michael@0: test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" michael@0: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ michael@0: for p in $$list; do echo "$$p $$p"; done | \ michael@0: @@ -2658,17 +2685,17 @@ michael@0: clean-binPROGRAMS: michael@0: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) michael@0: michael@0: clean-checkPROGRAMS: michael@0: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) michael@0: michael@0: clean-noinstPROGRAMS: michael@0: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) michael@0: -src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: +src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: @rm -f src/client/linux/linux_client_unittest$(EXEEXT) michael@0: $(src_client_linux_linux_client_unittest_LINK) $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_LDADD) $(LIBS) michael@0: src/client/linux/handler/src_client_linux_linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT): \ michael@0: src/client/linux/handler/$(am__dirstamp) \ michael@0: src/client/linux/handler/$(DEPDIR)/$(am__dirstamp) michael@0: src/client/linux/minidump_writer/src_client_linux_linux_client_unittest_shlib-directory_reader_unittest.$(OBJEXT): \ michael@0: src/client/linux/minidump_writer/$(am__dirstamp) \ michael@0: src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -2751,23 +2778,23 @@ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT): \ michael@0: src/common/android/$(am__dirstamp) \ michael@0: src/common/android/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT): \ michael@0: src/common/android/$(am__dirstamp) \ michael@0: src/common/android/$(DEPDIR)/$(am__dirstamp) michael@0: -src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: +src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: @rm -f src/client/linux/linux_client_unittest_shlib$(EXEEXT) michael@0: $(src_client_linux_linux_client_unittest_shlib_LINK) $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_LDADD) $(LIBS) michael@0: src/client/linux/minidump_writer/src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.$(OBJEXT): \ michael@0: src/client/linux/minidump_writer/$(am__dirstamp) \ michael@0: src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) michael@0: -src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: +src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) $(EXTRA_src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp) michael@0: @rm -f src/client/linux/linux_dumper_unittest_helper$(EXEEXT) michael@0: $(src_client_linux_linux_dumper_unittest_helper_LINK) $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_LDADD) $(LIBS) michael@0: src/common/src_common_dumper_unittest-byte_cursor_unittest.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/src_common_dumper_unittest-dwarf_cfi_to_module.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -2901,17 +2928,17 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_common_dumper_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_common_dumper_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp) michael@0: +src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) $(EXTRA_src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp) michael@0: @rm -f src/common/dumper_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_LDADD) $(LIBS) michael@0: src/common/src_common_test_assembler_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/src_common_test_assembler_unittest-test_assembler_unittest.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -2919,145 +2946,145 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_common_test_assembler_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp) michael@0: +src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) $(EXTRA_src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp) michael@0: @rm -f src/common/test_assembler_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_LDADD) $(LIBS) michael@0: src/processor/address_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/address_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/basic_source_line_resolver_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_binarystream_unittest-binarystream_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_binarystream_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_binarystream_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) $(EXTRA_src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/binarystream_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) $(EXTRA_src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/cfi_frame_info_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_LDADD) $(LIBS) michael@0: src/processor/contained_range_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/contained_range_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_disassembler_x86_unittest-disassembler_x86_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_disassembler_x86_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/disassembler_x86_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) $(EXTRA_src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/exploitability_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/fast_source_line_resolver_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_map_serializers_unittest-map_serializers_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_map_serializers_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_map_serializers_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) $(EXTRA_src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/map_serializers_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_LDADD) $(LIBS) michael@0: src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) $(EXTRA_src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/minidump_dump$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS) michael@0: src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/minidump_processor_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS) michael@0: src/processor/minidump_stackwalk.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) $(EXTRA_src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/minidump_stackwalk$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_LDADD) $(LIBS) michael@0: src/common/src_processor_minidump_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_minidump_unittest-minidump_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3068,35 +3095,35 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_minidump_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_minidump_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/minidump_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_LDADD) $(LIBS) michael@0: src/processor/pathname_stripper_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) $(EXTRA_src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/pathname_stripper_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_LDADD) $(LIBS) michael@0: src/processor/postfix_evaluator_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) $(EXTRA_src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/postfix_evaluator_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_LDADD) $(LIBS) michael@0: src/processor/range_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/range_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_LDADD) $(LIBS) michael@0: src/common/src_processor_stackwalker_amd64_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_stackwalker_amd64_unittest-stackwalker_amd64_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3104,17 +3131,17 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_stackwalker_amd64_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_stackwalker_amd64_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/stackwalker_amd64_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_LDADD) $(LIBS) michael@0: src/common/src_processor_stackwalker_arm_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_stackwalker_arm_unittest-stackwalker_arm_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3122,23 +3149,23 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_stackwalker_arm_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_stackwalker_arm_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/stackwalker_arm_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_LDADD) $(LIBS) michael@0: src/processor/stackwalker_selftest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/stackwalker_selftest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_LDADD) $(LIBS) michael@0: src/common/src_processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_stackwalker_x86_unittest-stackwalker_x86_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3146,65 +3173,65 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_stackwalker_x86_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_stackwalker_x86_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/stackwalker_x86_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_static_address_map_unittest-static_address_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_static_address_map_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_static_address_map_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/static_address_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_static_contained_range_map_unittest-static_contained_range_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_static_contained_range_map_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_static_contained_range_map_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/static_contained_range_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_static_map_unittest-static_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_static_map_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_static_map_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/static_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_LDADD) $(LIBS) michael@0: src/processor/src_processor_static_range_map_unittest-static_range_map_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_processor_static_range_map_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_static_range_map_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/static_range_map_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_LDADD) $(LIBS) michael@0: src/common/src_processor_synth_minidump_unittest-test_assembler.$(OBJEXT): \ michael@0: src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_synth_minidump_unittest-synth_minidump_unittest.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3215,17 +3242,17 @@ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_processor_synth_minidump_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT): \ michael@0: src/processor/$(am__dirstamp) \ michael@0: src/processor/$(DEPDIR)/$(am__dirstamp) michael@0: -src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: +src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) michael@0: @rm -f src/processor/synth_minidump_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_LDADD) $(LIBS) michael@0: src/tools/linux/core2md/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/core2md michael@0: @: > src/tools/linux/core2md/$(am__dirstamp) michael@0: src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/core2md/$(DEPDIR) michael@0: @: > src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp) michael@0: @@ -3233,29 +3260,27 @@ michael@0: src/tools/linux/core2md/$(am__dirstamp) \ michael@0: src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp) michael@0: src/client/linux/minidump_writer/linux_core_dumper.$(OBJEXT): \ michael@0: src/client/linux/minidump_writer/$(am__dirstamp) \ michael@0: src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/linux/elf_core_dump.$(OBJEXT): \ michael@0: src/common/linux/$(am__dirstamp) \ michael@0: src/common/linux/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp) michael@0: +src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) $(EXTRA_src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp) michael@0: @rm -f src/tools/linux/core2md/core2md$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_LDADD) $(LIBS) michael@0: src/common/dwarf_cfi_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/dwarf_cu_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/dwarf_line_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/language.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: -src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: - src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/stabs_reader.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/stabs_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ michael@0: src/common/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/dwarf/bytereader.$(OBJEXT): \ michael@0: src/common/dwarf/$(am__dirstamp) \ michael@0: src/common/dwarf/$(DEPDIR)/$(am__dirstamp) michael@0: src/common/dwarf/dwarf2diehandler.$(OBJEXT): \ michael@0: @@ -3274,65 +3299,65 @@ michael@0: @$(MKDIR_P) src/tools/linux/dump_syms michael@0: @: > src/tools/linux/dump_syms/$(am__dirstamp) michael@0: src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/dump_syms/$(DEPDIR) michael@0: @: > src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp) michael@0: src/tools/linux/dump_syms/dump_syms.$(OBJEXT): \ michael@0: src/tools/linux/dump_syms/$(am__dirstamp) \ michael@0: src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp) michael@0: +src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) $(EXTRA_src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp) michael@0: @rm -f src/tools/linux/dump_syms/dump_syms$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_LDADD) $(LIBS) michael@0: src/tools/linux/md2core/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/md2core michael@0: @: > src/tools/linux/md2core/$(am__dirstamp) michael@0: src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/md2core/$(DEPDIR) michael@0: @: > src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) michael@0: src/tools/linux/md2core/minidump-2-core.$(OBJEXT): \ michael@0: src/tools/linux/md2core/$(am__dirstamp) \ michael@0: src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) michael@0: +src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) michael@0: @rm -f src/tools/linux/md2core/minidump-2-core$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_LDADD) $(LIBS) michael@0: src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest-all.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest_main.$(OBJEXT): \ michael@0: src/testing/gtest/src/$(am__dirstamp) \ michael@0: src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/testing/src/src_tools_linux_md2core_minidump_2_core_unittest-gmock-all.$(OBJEXT): \ michael@0: src/testing/src/$(am__dirstamp) \ michael@0: src/testing/src/$(DEPDIR)/$(am__dirstamp) michael@0: src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT): \ michael@0: src/tools/linux/md2core/$(am__dirstamp) \ michael@0: src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) michael@0: +src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) michael@0: @rm -f src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_LDADD) $(LIBS) michael@0: src/common/linux/http_upload.$(OBJEXT): \ michael@0: src/common/linux/$(am__dirstamp) \ michael@0: src/common/linux/$(DEPDIR)/$(am__dirstamp) michael@0: src/tools/linux/symupload/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/symupload michael@0: @: > src/tools/linux/symupload/$(am__dirstamp) michael@0: src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp): michael@0: @$(MKDIR_P) src/tools/linux/symupload/$(DEPDIR) michael@0: @: > src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) michael@0: src/tools/linux/symupload/minidump_upload.$(OBJEXT): \ michael@0: src/tools/linux/symupload/$(am__dirstamp) \ michael@0: src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) michael@0: +src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) michael@0: @rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS) michael@0: src/tools/linux/symupload/sym_upload.$(OBJEXT): \ michael@0: src/tools/linux/symupload/$(am__dirstamp) \ michael@0: src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) michael@0: -src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) michael@0: +src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) michael@0: @rm -f src/tools/linux/symupload/sym_upload$(EXEEXT) michael@0: $(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS) michael@0: michael@0: mostlyclean-compile: michael@0: -rm -f *.$(OBJEXT) michael@0: -rm -f src/client/linux/crash_generation/crash_generation_client.$(OBJEXT) michael@0: -rm -f src/client/linux/crash_generation/crash_generation_server.$(OBJEXT) michael@0: -rm -f src/client/linux/handler/exception_handler.$(OBJEXT) michael@0: @@ -5859,19 +5884,17 @@ michael@0: echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ michael@0: $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ michael@0: done michael@0: michael@0: uninstall-dist_docDATA: michael@0: @$(NORMAL_UNINSTALL) michael@0: @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ michael@0: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ michael@0: - test -n "$$files" || exit 0; \ michael@0: - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ michael@0: - cd "$(DESTDIR)$(docdir)" && rm -f $$files michael@0: + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) michael@0: michael@0: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) michael@0: list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ michael@0: unique=`for i in $$list; do \ michael@0: if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ michael@0: done | \ michael@0: $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ michael@0: END { if (nonempty) { for (i in files) print i; }; }'`; \ michael@0: @@ -5996,24 +6019,25 @@ michael@0: report=""; \ michael@0: if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ michael@0: report="Please report to $(PACKAGE_BUGREPORT)"; \ michael@0: test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ michael@0: dashes="$$report"; \ michael@0: fi; \ michael@0: dashes=`echo "$$dashes" | sed s/./=/g`; \ michael@0: if test "$$failed" -eq 0; then \ michael@0: - echo "$$grn$$dashes"; \ michael@0: + col="$$grn"; \ michael@0: else \ michael@0: - echo "$$red$$dashes"; \ michael@0: + col="$$red"; \ michael@0: fi; \ michael@0: - echo "$$banner"; \ michael@0: - test -z "$$skipped" || echo "$$skipped"; \ michael@0: - test -z "$$report" || echo "$$report"; \ michael@0: - echo "$$dashes$$std"; \ michael@0: + echo "$${col}$$dashes$${std}"; \ michael@0: + echo "$${col}$$banner$${std}"; \ michael@0: + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ michael@0: + test -z "$$report" || echo "$${col}$$report$${std}"; \ michael@0: + echo "$${col}$$dashes$${std}"; \ michael@0: test "$$failed" -eq 0; \ michael@0: else :; fi michael@0: michael@0: distdir: $(DISTFILES) michael@0: $(am__remove_distdir) michael@0: test -d "$(distdir)" || mkdir "$(distdir)" michael@0: @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ michael@0: topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ michael@0: @@ -6051,25 +6075,29 @@ michael@0: ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ michael@0: ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ michael@0: || chmod -R a+r "$(distdir)" michael@0: dist-gzip: distdir michael@0: tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz michael@0: $(am__remove_distdir) michael@0: michael@0: dist-bzip2: distdir michael@0: - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 michael@0: + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 michael@0: + $(am__remove_distdir) michael@0: + michael@0: +dist-lzip: distdir michael@0: + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz michael@0: $(am__remove_distdir) michael@0: michael@0: dist-lzma: distdir michael@0: tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma michael@0: $(am__remove_distdir) michael@0: michael@0: dist-xz: distdir michael@0: - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz michael@0: + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz michael@0: $(am__remove_distdir) michael@0: michael@0: dist-tarZ: distdir michael@0: tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z michael@0: $(am__remove_distdir) michael@0: michael@0: dist-shar: distdir michael@0: shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz michael@0: @@ -6090,16 +6118,18 @@ michael@0: distcheck: dist michael@0: case '$(DIST_ARCHIVES)' in \ michael@0: *.tar.gz*) \ michael@0: GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ michael@0: *.tar.bz2*) \ michael@0: bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ michael@0: *.tar.lzma*) \ michael@0: lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ michael@0: + *.tar.lz*) \ michael@0: + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ michael@0: *.tar.xz*) \ michael@0: xz -dc $(distdir).tar.xz | $(am__untar) ;;\ michael@0: *.tar.Z*) \ michael@0: uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ michael@0: *.shar.gz*) \ michael@0: GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ michael@0: *.zip*) \ michael@0: unzip $(distdir).zip ;;\ michael@0: @@ -6109,16 +6139,17 @@ michael@0: mkdir $(distdir)/_inst michael@0: chmod a-w $(distdir) michael@0: test -d $(distdir)/_build || exit 0; \ michael@0: dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ michael@0: && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ michael@0: && am__cwd=`pwd` \ michael@0: && $(am__cd) $(distdir)/_build \ michael@0: && ../configure --srcdir=.. --prefix="$$dc_install_base" \ michael@0: + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ michael@0: $(DISTCHECK_CONFIGURE_FLAGS) \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) dvi \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) check \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) install \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) installcheck \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) uninstall \ michael@0: && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ michael@0: @@ -6137,18 +6168,26 @@ michael@0: && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ michael@0: && cd "$$am__cwd" \ michael@0: || exit 1 michael@0: $(am__remove_distdir) michael@0: @(echo "$(distdir) archives ready for distribution: "; \ michael@0: list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ michael@0: sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' michael@0: distuninstallcheck: michael@0: - @$(am__cd) '$(distuninstallcheck_dir)' \ michael@0: - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ michael@0: + @test -n '$(distuninstallcheck_dir)' || { \ michael@0: + echo 'ERROR: trying to run $@ with an empty' \ michael@0: + '$$(distuninstallcheck_dir)' >&2; \ michael@0: + exit 1; \ michael@0: + }; \ michael@0: + $(am__cd) '$(distuninstallcheck_dir)' || { \ michael@0: + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ michael@0: + exit 1; \ michael@0: + }; \ michael@0: + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ michael@0: || { echo "ERROR: files left after uninstall:" ; \ michael@0: if test -n "$(DESTDIR)"; then \ michael@0: echo " (check DESTDIR support)"; \ michael@0: fi ; \ michael@0: $(distuninstallcheck_listfiles) ; \ michael@0: exit 1; } >&2 michael@0: distcleancheck: distclean michael@0: @if test '$(srcdir)' = . ; then \ michael@0: @@ -6173,20 +6212,25 @@ michael@0: install-data: install-data-am michael@0: uninstall: uninstall-am michael@0: michael@0: install-am: all-am michael@0: @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am michael@0: michael@0: installcheck: installcheck-am michael@0: install-strip: michael@0: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ michael@0: - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ michael@0: - `test -z '$(STRIP)' || \ michael@0: - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install michael@0: + if test -z '$(STRIP)'; then \ michael@0: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ michael@0: + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ michael@0: + install; \ michael@0: + else \ michael@0: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ michael@0: + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ michael@0: + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ michael@0: + fi michael@0: mostlyclean-generic: michael@0: michael@0: clean-generic: michael@0: michael@0: distclean-generic: michael@0: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) michael@0: -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) michael@0: -rm -f src/$(am__dirstamp) michael@0: @@ -6308,18 +6352,18 @@ michael@0: uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ michael@0: uninstall-libLIBRARIES michael@0: michael@0: .MAKE: check-am install-am install-strip michael@0: michael@0: .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ michael@0: clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ michael@0: clean-libLIBRARIES clean-noinstLIBRARIES clean-noinstPROGRAMS \ michael@0: - ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ michael@0: - dist-tarZ dist-xz dist-zip distcheck distclean \ michael@0: + ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \ michael@0: + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ michael@0: distclean-compile distclean-generic distclean-hdr \ michael@0: distclean-tags distcleancheck distdir distuninstallcheck dvi \ michael@0: dvi-am html html-am info info-am install install-am \ michael@0: install-binPROGRAMS install-data install-data-am \ michael@0: install-dist_docDATA install-dvi install-dvi-am install-exec \ michael@0: install-exec-am install-html install-html-am install-info \ michael@0: install-info-am install-libLIBRARIES install-man install-pdf \ michael@0: install-pdf-am install-ps install-ps-am install-strip \ michael@0: diff --git a/aclocal.m4 b/aclocal.m4 michael@0: --- a/aclocal.m4 michael@0: +++ b/aclocal.m4 michael@0: @@ -1,61 +1,65 @@ michael@0: -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- michael@0: +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- michael@0: michael@0: # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, michael@0: -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. michael@0: +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, michael@0: +# Inc. michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: # This program is distributed in the hope that it will be useful, michael@0: # but WITHOUT ANY WARRANTY, to the extent permitted by law; without michael@0: # even the implied warranty of MERCHANTABILITY or FITNESS FOR A michael@0: # PARTICULAR PURPOSE. michael@0: michael@0: m4_ifndef([AC_AUTOCONF_VERSION], michael@0: [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl michael@0: -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, michael@0: -[m4_warning([this file was generated for autoconf 2.65. michael@0: +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, michael@0: +[m4_warning([this file was generated for autoconf 2.68. michael@0: You have another version of autoconf. It may work, but is not guaranteed to. michael@0: If you have problems, you may need to regenerate the build system entirely. michael@0: To do so, use the procedure documented by the package, typically `autoreconf'.])]) michael@0: michael@0: -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software michael@0: +# Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # AM_AUTOMAKE_VERSION(VERSION) michael@0: # ---------------------------- michael@0: # Automake X.Y traces this macro to ensure aclocal.m4 has been michael@0: # generated from the m4 files accompanying Automake X.Y. michael@0: # (This private macro should not be called outside this file.) michael@0: AC_DEFUN([AM_AUTOMAKE_VERSION], michael@0: [am__api_version='1.11' michael@0: dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to michael@0: dnl require some minimum version. Point them to the right macro. michael@0: -m4_if([$1], [1.11.1], [], michael@0: +m4_if([$1], [1.11.3], [], michael@0: [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl michael@0: ]) michael@0: michael@0: # _AM_AUTOCONF_VERSION(VERSION) michael@0: # ----------------------------- michael@0: # aclocal traces this macro to find the Autoconf version. michael@0: # This is a private macro too. Using m4_define simplifies michael@0: # the logic in aclocal, which can simply ignore this definition. michael@0: m4_define([_AM_AUTOCONF_VERSION], []) michael@0: michael@0: # AM_SET_CURRENT_AUTOMAKE_VERSION michael@0: # ------------------------------- michael@0: # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. michael@0: # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. michael@0: AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], michael@0: -[AM_AUTOMAKE_VERSION([1.11.1])dnl michael@0: +[AM_AUTOMAKE_VERSION([1.11.3])dnl michael@0: m4_ifndef([AC_AUTOCONF_VERSION], michael@0: [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl michael@0: _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) michael@0: michael@0: # Figure out how to run the assembler. -*- Autoconf -*- michael@0: michael@0: # Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. michael@0: # michael@0: @@ -74,22 +78,24 @@ michael@0: test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS michael@0: AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) michael@0: AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) michael@0: _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl michael@0: ]) michael@0: michael@0: # AM_AUX_DIR_EXPAND -*- Autoconf -*- michael@0: michael@0: -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets michael@0: # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to michael@0: # `$srcdir', `$srcdir/..', or `$srcdir/../..'. michael@0: # michael@0: # Of course, Automake must honor this variable whenever it calls a michael@0: # tool from the auxiliary directory. The problem is that $srcdir (and michael@0: # therefore $ac_aux_dir as well) can be either absolute or relative, michael@0: # depending on how configure is run. This is pretty annoying, since michael@0: @@ -161,24 +167,24 @@ michael@0: $1_FALSE= michael@0: fi michael@0: AC_CONFIG_COMMANDS_PRE( michael@0: [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then michael@0: AC_MSG_ERROR([[conditional "$1" was never defined. michael@0: Usually this means the macro was only invoked conditionally.]]) michael@0: fi])]) michael@0: michael@0: -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 michael@0: -# Free Software Foundation, Inc. michael@0: +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, michael@0: +# 2010, 2011 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: -# serial 10 michael@0: +# serial 12 michael@0: michael@0: # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be michael@0: # written in clear, in which case automake, when reading aclocal.m4, michael@0: # will think it sees a *use*, and therefore will trigger all it's michael@0: # C support machinery. Also note that it means that autoscan, seeing michael@0: # CC etc. in the Makefile, will ask for an AC_PROG_CC use... michael@0: michael@0: michael@0: @@ -208,16 +214,17 @@ michael@0: AC_CACHE_CHECK([dependency style of $depcc], michael@0: [am_cv_$1_dependencies_compiler_type], michael@0: [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then michael@0: # We make a subdir and do the tests there. Otherwise we can end up michael@0: # making bogus files that we don't know about and never remove. For michael@0: # instance it was reported that on HP-UX the gcc test will end up michael@0: # making a dummy file named `D' -- because `-MD' means `put the output michael@0: # in D'. michael@0: + rm -rf conftest.dir michael@0: mkdir conftest.dir michael@0: # Copy depcomp to subdir because otherwise we won't find it if we're michael@0: # using a relative directory. michael@0: cp "$am_depcomp" conftest.dir michael@0: cd conftest.dir michael@0: # We will build objects and dependencies in a subdirectory because michael@0: # it helps to detect inapplicable dependency modes. For instance michael@0: # both Tru64's cc and ICC support -MD to output dependencies as a michael@0: @@ -272,17 +279,17 @@ michael@0: # after this tag, mechanisms are not by side-effect, so they'll michael@0: # only be used when explicitly requested michael@0: if test "x$enable_dependency_tracking" = xyes; then michael@0: continue michael@0: else michael@0: break michael@0: fi michael@0: ;; michael@0: - msvisualcpp | msvcmsys) michael@0: + msvc7 | msvc7msys | msvisualcpp | msvcmsys) michael@0: # This compiler won't grok `-c -o', but also, the minuso test has michael@0: # not run yet. These depmodes are late enough in the game, and michael@0: # so weak that their functioning should not be impacted. michael@0: am__obj=conftest.${OBJEXT-o} michael@0: am__minus_obj= michael@0: ;; michael@0: none) break ;; michael@0: esac michael@0: @@ -337,20 +344,23 @@ michael@0: # ------------ michael@0: AC_DEFUN([AM_DEP_TRACK], michael@0: [AC_ARG_ENABLE(dependency-tracking, michael@0: [ --disable-dependency-tracking speeds up one-time build michael@0: --enable-dependency-tracking do not reject slow dependency extractors]) michael@0: if test "x$enable_dependency_tracking" != xno; then michael@0: am_depcomp="$ac_aux_dir/depcomp" michael@0: AMDEPBACKSLASH='\' michael@0: + am__nodep='_no' michael@0: fi michael@0: AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) michael@0: AC_SUBST([AMDEPBACKSLASH])dnl michael@0: _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl michael@0: +AC_SUBST([am__nodep])dnl michael@0: +_AM_SUBST_NOTMAKE([am__nodep])dnl michael@0: ]) michael@0: michael@0: # Generate code to set up dependency tracking. -*- Autoconf -*- michael@0: michael@0: # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 michael@0: # Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: @@ -574,22 +584,25 @@ michael@0: $_am_arg | $_am_arg:* ) michael@0: break ;; michael@0: * ) michael@0: _am_stamp_count=`expr $_am_stamp_count + 1` ;; michael@0: esac michael@0: done michael@0: echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) michael@0: michael@0: -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, michael@0: +# Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # AM_PROG_INSTALL_SH michael@0: # ------------------ michael@0: # Define $install_sh. michael@0: AC_DEFUN([AM_PROG_INSTALL_SH], michael@0: [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl michael@0: if test x"${install_sh}" != xset; then michael@0: case $am_aux_dir in michael@0: *\ * | *\ *) michael@0: @@ -746,22 +759,25 @@ michael@0: if eval "$MISSING --run true"; then michael@0: am_missing_run="$MISSING --run " michael@0: else michael@0: am_missing_run= michael@0: AC_MSG_WARN([`missing' script is too old or missing]) michael@0: fi michael@0: ]) michael@0: michael@0: -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, michael@0: +# Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # AM_PROG_MKDIR_P michael@0: # --------------- michael@0: # Check for `mkdir -p'. michael@0: AC_DEFUN([AM_PROG_MKDIR_P], michael@0: [AC_PREREQ([2.60])dnl michael@0: AC_REQUIRE([AC_PROG_MKDIR_P])dnl michael@0: dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, michael@0: dnl while keeping a definition of mkdir_p for backward compatibility. michael@0: @@ -774,53 +790,56 @@ michael@0: case $mkdir_p in michael@0: [[\\/$]]* | ?:[[\\/]]*) ;; michael@0: */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; michael@0: esac michael@0: ]) michael@0: michael@0: # Helper functions for option handling. -*- Autoconf -*- michael@0: michael@0: -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software michael@0: +# Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: -# serial 4 michael@0: +# serial 5 michael@0: michael@0: # _AM_MANGLE_OPTION(NAME) michael@0: # ----------------------- michael@0: AC_DEFUN([_AM_MANGLE_OPTION], michael@0: [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) michael@0: michael@0: # _AM_SET_OPTION(NAME) michael@0: -# ------------------------------ michael@0: +# -------------------- michael@0: # Set option NAME. Presently that only means defining a flag for this option. michael@0: AC_DEFUN([_AM_SET_OPTION], michael@0: [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) michael@0: michael@0: # _AM_SET_OPTIONS(OPTIONS) michael@0: -# ---------------------------------- michael@0: +# ------------------------ michael@0: # OPTIONS is a space-separated list of Automake options. michael@0: AC_DEFUN([_AM_SET_OPTIONS], michael@0: [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) michael@0: michael@0: # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) michael@0: # ------------------------------------------- michael@0: # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. michael@0: AC_DEFUN([_AM_IF_OPTION], michael@0: [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) michael@0: michael@0: -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # AM_RUN_LOG(COMMAND) michael@0: # ------------------- michael@0: # Run COMMAND, save the exit status in ac_status, and log it. michael@0: # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) michael@0: AC_DEFUN([AM_RUN_LOG], michael@0: [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD michael@0: ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD michael@0: ac_status=$? michael@0: @@ -887,22 +906,24 @@ michael@0: # Ok. michael@0: : michael@0: else michael@0: AC_MSG_ERROR([newly created file is older than distributed files! michael@0: Check your system clock]) michael@0: fi michael@0: AC_MSG_RESULT(yes)]) michael@0: michael@0: -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: +# serial 1 michael@0: + michael@0: # AM_PROG_INSTALL_STRIP michael@0: # --------------------- michael@0: # One issue with vendor `install' (even GNU) is that you can't michael@0: # specify the program used to strip binaries. This is especially michael@0: # annoying in cross-compiling environments, where the build's strip michael@0: # is unlikely to handle the host's binaries. michael@0: # Fortunately install-sh will honor a STRIPPROG variable, so we michael@0: # always use install-sh in `make install-strip', and initialize michael@0: @@ -915,38 +936,38 @@ michael@0: # will honor the `STRIP' environment variable to overrule this program. michael@0: dnl Don't test for $cross_compiling = yes, because it might be `maybe'. michael@0: if test "$cross_compiling" != no; then michael@0: AC_CHECK_TOOL([STRIP], [strip], :) michael@0: fi michael@0: INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" michael@0: AC_SUBST([INSTALL_STRIP_PROGRAM])]) michael@0: michael@0: -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: -# serial 2 michael@0: +# serial 3 michael@0: michael@0: # _AM_SUBST_NOTMAKE(VARIABLE) michael@0: # --------------------------- michael@0: # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. michael@0: # This macro is traced by Automake. michael@0: AC_DEFUN([_AM_SUBST_NOTMAKE]) michael@0: michael@0: # AM_SUBST_NOTMAKE(VARIABLE) michael@0: -# --------------------------- michael@0: +# -------------------------- michael@0: # Public sister of _AM_SUBST_NOTMAKE. michael@0: AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) michael@0: michael@0: # Check how to create a tarball. -*- Autoconf -*- michael@0: michael@0: -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. michael@0: +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. michael@0: # michael@0: # This file is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy and/or distribute it, michael@0: # with or without modifications, as long as this notice is preserved. michael@0: michael@0: # serial 2 michael@0: michael@0: # _AM_PROG_TAR(FORMAT) michael@0: @@ -958,20 +979,21 @@ michael@0: # writing to stdout a FORMAT-tarball containing the directory michael@0: # $tardir. michael@0: # tardir=directory && $(am__tar) > result.tar michael@0: # michael@0: # Substitute a variable $(am__untar) that extract such michael@0: # a tarball read from stdin. michael@0: # $(am__untar) < result.tar michael@0: AC_DEFUN([_AM_PROG_TAR], michael@0: -[# Always define AMTAR for backward compatibility. michael@0: -AM_MISSING_PROG([AMTAR], [tar]) michael@0: +[# Always define AMTAR for backward compatibility. Yes, it's still used michael@0: +# in the wild :-( We should find a proper way to deprecate it ... michael@0: +AC_SUBST([AMTAR], ['$${TAR-tar}']) michael@0: m4_if([$1], [v7], michael@0: - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], michael@0: + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], michael@0: [m4_case([$1], [ustar],, [pax],, michael@0: [m4_fatal([Unknown tar format])]) michael@0: AC_MSG_CHECKING([how to create a $1 tar archive]) michael@0: # Loop over all known methods to create a tar archive until one works. michael@0: _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' michael@0: _am_tools=${am_cv_prog_tar_$1-$_am_tools} michael@0: # Do not fold the above two line into one, because Tru64 sh and michael@0: # Solaris sh will not grok spaces in the rhs of `-'. michael@0: diff --git a/configure b/configure michael@0: --- a/configure michael@0: +++ b/configure michael@0: @@ -1,18 +1,18 @@ michael@0: #! /bin/sh michael@0: # Guess values for system-dependent variables and create Makefiles. michael@0: -# Generated by GNU Autoconf 2.65 for breakpad 0.1. michael@0: +# Generated by GNU Autoconf 2.68 for breakpad 0.1. michael@0: # michael@0: # Report bugs to . michael@0: # michael@0: # michael@0: # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, michael@0: -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, michael@0: -# Inc. michael@0: +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software michael@0: +# Foundation, Inc. michael@0: # michael@0: # michael@0: # This configure script is free software; the Free Software Foundation michael@0: # gives unlimited permission to copy, distribute and modify it. michael@0: ## -------------------- ## michael@0: ## M4sh Initialization. ## michael@0: ## -------------------- ## michael@0: michael@0: @@ -86,16 +86,17 @@ michael@0: # IFS michael@0: # We need space, tab and new line, in precisely that order. Quoting is michael@0: # there to prevent editors from complaining about space-tab. michael@0: # (If _AS_PATH_WALK were called with IFS unset, it would disable word michael@0: # splitting by setting IFS to empty value.) michael@0: IFS=" "" $as_nl" michael@0: michael@0: # Find who we are. Look in the path if we contain no directory separator. michael@0: +as_myself= michael@0: case $0 in #(( michael@0: *[\\/]* ) as_myself=$0 ;; michael@0: *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: IFS=$as_save_IFS michael@0: test -z "$as_dir" && as_dir=. michael@0: test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break michael@0: @@ -211,21 +212,28 @@ michael@0: fi; } michael@0: IFS=$as_save_IFS michael@0: michael@0: michael@0: if test "x$CONFIG_SHELL" != x; then : michael@0: # We cannot yet assume a decent shell, so we have to provide a michael@0: # neutralization value for shells without unset; and this also michael@0: # works around shells that cannot unset nonexistent variables. michael@0: + # Preserve -v and -x to the replacement shell. michael@0: BASH_ENV=/dev/null michael@0: ENV=/dev/null michael@0: (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV michael@0: export CONFIG_SHELL michael@0: - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} michael@0: + case $- in # (((( michael@0: + *v*x* | *x*v* ) as_opts=-vx ;; michael@0: + *v* ) as_opts=-v ;; michael@0: + *x* ) as_opts=-x ;; michael@0: + * ) as_opts= ;; michael@0: + esac michael@0: + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} michael@0: fi michael@0: michael@0: if test x$as_have_required = xno; then : michael@0: $as_echo "$0: This script requires a shell more modern than all" michael@0: $as_echo "$0: the shells that I found on your system." michael@0: if test x${ZSH_VERSION+set} = xset ; then michael@0: $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" michael@0: $as_echo "$0: be upgraded to zsh 4.3.4 or later." michael@0: @@ -314,17 +322,17 @@ michael@0: /^X\(\/\).*/{ michael@0: s//\1/ michael@0: q michael@0: } michael@0: s/.*/./; q'` michael@0: test -d "$as_dir" && break michael@0: done michael@0: test -z "$as_dirs" || eval "mkdir $as_dirs" michael@0: - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" michael@0: + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" michael@0: michael@0: michael@0: } # as_fn_mkdir_p michael@0: # as_fn_append VAR VALUE michael@0: # ---------------------- michael@0: # Append the text in VALUE to the end of the definition contained in VAR. Take michael@0: # advantage of any shell optimizations that allow amortized linear growth over michael@0: # repeated appends, instead of the typical quadratic growth present in naive michael@0: @@ -354,29 +362,29 @@ michael@0: else michael@0: as_fn_arith () michael@0: { michael@0: as_val=`expr "$@" || test $? -eq 1` michael@0: } michael@0: fi # as_fn_arith michael@0: michael@0: michael@0: -# as_fn_error ERROR [LINENO LOG_FD] michael@0: -# --------------------------------- michael@0: +# as_fn_error STATUS ERROR [LINENO LOG_FD] michael@0: +# ---------------------------------------- michael@0: # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are michael@0: # provided, also output the error to LOG_FD, referencing LINENO. Then exit the michael@0: -# script with status $?, using 1 if that was 0. michael@0: +# script with STATUS, using 1 if that was 0. michael@0: as_fn_error () michael@0: { michael@0: - as_status=$?; test $as_status -eq 0 && as_status=1 michael@0: - if test "$3"; then michael@0: - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 michael@0: + as_status=$1; test $as_status -eq 0 && as_status=1 michael@0: + if test "$4"; then michael@0: + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 michael@0: fi michael@0: - $as_echo "$as_me: error: $1" >&2 michael@0: + $as_echo "$as_me: error: $2" >&2 michael@0: as_fn_exit $as_status michael@0: } # as_fn_error michael@0: michael@0: if expr a : '\(a\)' >/dev/null 2>&1 && michael@0: test "X`expr 00001 : '.*\(...\)'`" = X001; then michael@0: as_expr=expr michael@0: else michael@0: as_expr=false michael@0: @@ -528,17 +536,17 @@ michael@0: # Sed expression to map a string onto a valid variable name. michael@0: as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" michael@0: michael@0: michael@0: test -n "$DJDIR" || exec 7<&0 &1 michael@0: michael@0: # Name of the host. michael@0: -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, michael@0: +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, michael@0: # so uname gets run too. michael@0: ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` michael@0: michael@0: # michael@0: # Initializations. michael@0: # michael@0: ac_default_prefix=/usr/local michael@0: ac_clean_files= michael@0: @@ -627,16 +635,17 @@ michael@0: am__fastdepCCAS_FALSE michael@0: am__fastdepCCAS_TRUE michael@0: CCASDEPMODE michael@0: CCASFLAGS michael@0: CCAS michael@0: am__fastdepCC_FALSE michael@0: am__fastdepCC_TRUE michael@0: CCDEPMODE michael@0: +am__nodep michael@0: AMDEPBACKSLASH michael@0: AMDEP_FALSE michael@0: AMDEP_TRUE michael@0: am__quote michael@0: am__include michael@0: DEPDIR michael@0: OBJEXT michael@0: EXEEXT michael@0: @@ -794,18 +803,19 @@ michael@0: # If the previous option needs an argument, assign it. michael@0: if test -n "$ac_prev"; then michael@0: eval $ac_prev=\$ac_option michael@0: ac_prev= michael@0: continue michael@0: fi michael@0: michael@0: case $ac_option in michael@0: - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; michael@0: - *) ac_optarg=yes ;; michael@0: + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; michael@0: + *=) ac_optarg= ;; michael@0: + *) ac_optarg=yes ;; michael@0: esac michael@0: michael@0: # Accept the important Cygnus configure options, so we can diagnose typos. michael@0: michael@0: case $ac_dashdash$ac_option in michael@0: --) michael@0: ac_dashdash=yes ;; michael@0: michael@0: @@ -840,17 +850,17 @@ michael@0: -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ michael@0: | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) michael@0: datarootdir=$ac_optarg ;; michael@0: michael@0: -disable-* | --disable-*) michael@0: ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` michael@0: # Reject names that are not valid shell variable names. michael@0: expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && michael@0: - as_fn_error "invalid feature name: $ac_useropt" michael@0: + as_fn_error $? "invalid feature name: $ac_useropt" michael@0: ac_useropt_orig=$ac_useropt michael@0: ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` michael@0: case $ac_user_opts in michael@0: *" michael@0: "enable_$ac_useropt" michael@0: "*) ;; michael@0: *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" michael@0: ac_unrecognized_sep=', ';; michael@0: @@ -866,17 +876,17 @@ michael@0: ac_prev=dvidir ;; michael@0: -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) michael@0: dvidir=$ac_optarg ;; michael@0: michael@0: -enable-* | --enable-*) michael@0: ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` michael@0: # Reject names that are not valid shell variable names. michael@0: expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && michael@0: - as_fn_error "invalid feature name: $ac_useropt" michael@0: + as_fn_error $? "invalid feature name: $ac_useropt" michael@0: ac_useropt_orig=$ac_useropt michael@0: ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` michael@0: case $ac_user_opts in michael@0: *" michael@0: "enable_$ac_useropt" michael@0: "*) ;; michael@0: *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" michael@0: ac_unrecognized_sep=', ';; michael@0: @@ -1070,33 +1080,33 @@ michael@0: michael@0: -version | --version | --versio | --versi | --vers | -V) michael@0: ac_init_version=: ;; michael@0: michael@0: -with-* | --with-*) michael@0: ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` michael@0: # Reject names that are not valid shell variable names. michael@0: expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && michael@0: - as_fn_error "invalid package name: $ac_useropt" michael@0: + as_fn_error $? "invalid package name: $ac_useropt" michael@0: ac_useropt_orig=$ac_useropt michael@0: ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` michael@0: case $ac_user_opts in michael@0: *" michael@0: "with_$ac_useropt" michael@0: "*) ;; michael@0: *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" michael@0: ac_unrecognized_sep=', ';; michael@0: esac michael@0: eval with_$ac_useropt=\$ac_optarg ;; michael@0: michael@0: -without-* | --without-*) michael@0: ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` michael@0: # Reject names that are not valid shell variable names. michael@0: expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && michael@0: - as_fn_error "invalid package name: $ac_useropt" michael@0: + as_fn_error $? "invalid package name: $ac_useropt" michael@0: ac_useropt_orig=$ac_useropt michael@0: ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` michael@0: case $ac_user_opts in michael@0: *" michael@0: "with_$ac_useropt" michael@0: "*) ;; michael@0: *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" michael@0: ac_unrecognized_sep=', ';; michael@0: @@ -1116,50 +1126,50 @@ michael@0: michael@0: -x-libraries | --x-libraries | --x-librarie | --x-librari \ michael@0: | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) michael@0: ac_prev=x_libraries ;; michael@0: -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ michael@0: | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) michael@0: x_libraries=$ac_optarg ;; michael@0: michael@0: - -*) as_fn_error "unrecognized option: \`$ac_option' michael@0: -Try \`$0 --help' for more information." michael@0: + -*) as_fn_error $? "unrecognized option: \`$ac_option' michael@0: +Try \`$0 --help' for more information" michael@0: ;; michael@0: michael@0: *=*) michael@0: ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` michael@0: # Reject names that are not valid shell variable names. michael@0: case $ac_envvar in #( michael@0: '' | [0-9]* | *[!_$as_cr_alnum]* ) michael@0: - as_fn_error "invalid variable name: \`$ac_envvar'" ;; michael@0: + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; michael@0: esac michael@0: eval $ac_envvar=\$ac_optarg michael@0: export $ac_envvar ;; michael@0: michael@0: *) michael@0: # FIXME: should be removed in autoconf 3.0. michael@0: $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 michael@0: expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && michael@0: $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 michael@0: - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} michael@0: + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" michael@0: ;; michael@0: michael@0: esac michael@0: done michael@0: michael@0: if test -n "$ac_prev"; then michael@0: ac_option=--`echo $ac_prev | sed 's/_/-/g'` michael@0: - as_fn_error "missing argument to $ac_option" michael@0: + as_fn_error $? "missing argument to $ac_option" michael@0: fi michael@0: michael@0: if test -n "$ac_unrecognized_opts"; then michael@0: case $enable_option_checking in michael@0: no) ;; michael@0: - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; michael@0: + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; michael@0: *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; michael@0: esac michael@0: fi michael@0: michael@0: # Check all directory arguments for consistency. michael@0: for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ michael@0: datadir sysconfdir sharedstatedir localstatedir includedir \ michael@0: oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ michael@0: @@ -1172,49 +1182,49 @@ michael@0: ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` michael@0: eval $ac_var=\$ac_val;; michael@0: esac michael@0: # Be sure to have absolute directory names. michael@0: case $ac_val in michael@0: [\\/$]* | ?:[\\/]* ) continue;; michael@0: NONE | '' ) case $ac_var in *prefix ) continue;; esac;; michael@0: esac michael@0: - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" michael@0: + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" michael@0: done michael@0: michael@0: # There might be people who depend on the old broken behavior: `$host' michael@0: # used to hold the argument of --host etc. michael@0: # FIXME: To remove some day. michael@0: build=$build_alias michael@0: host=$host_alias michael@0: target=$target_alias michael@0: michael@0: # FIXME: To remove some day. michael@0: if test "x$host_alias" != x; then michael@0: if test "x$build_alias" = x; then michael@0: cross_compiling=maybe michael@0: - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. michael@0: - If a cross compiler is detected then cross compile mode will be used." >&2 michael@0: + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. michael@0: + If a cross compiler is detected then cross compile mode will be used" >&2 michael@0: elif test "x$build_alias" != "x$host_alias"; then michael@0: cross_compiling=yes michael@0: fi michael@0: fi michael@0: michael@0: ac_tool_prefix= michael@0: test -n "$host_alias" && ac_tool_prefix=$host_alias- michael@0: michael@0: test "$silent" = yes && exec 6>/dev/null michael@0: michael@0: michael@0: ac_pwd=`pwd` && test -n "$ac_pwd" && michael@0: ac_ls_di=`ls -di .` && michael@0: ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || michael@0: - as_fn_error "working directory cannot be determined" michael@0: + as_fn_error $? "working directory cannot be determined" michael@0: test "X$ac_ls_di" = "X$ac_pwd_ls_di" || michael@0: - as_fn_error "pwd does not report name of working directory" michael@0: + as_fn_error $? "pwd does not report name of working directory" michael@0: michael@0: michael@0: # Find the source files, if location was not specified. michael@0: if test -z "$srcdir"; then michael@0: ac_srcdir_defaulted=yes michael@0: # Try the directory containing this script, then the parent directory. michael@0: ac_confdir=`$as_dirname -- "$as_myself" || michael@0: $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ michael@0: @@ -1243,21 +1253,21 @@ michael@0: if test ! -r "$srcdir/$ac_unique_file"; then michael@0: srcdir=.. michael@0: fi michael@0: else michael@0: ac_srcdir_defaulted=no michael@0: fi michael@0: if test ! -r "$srcdir/$ac_unique_file"; then michael@0: test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." michael@0: - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" michael@0: + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" michael@0: fi michael@0: ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" michael@0: ac_abs_confdir=`( michael@0: - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" michael@0: + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" michael@0: pwd)` michael@0: # When building in place, set srcdir=. michael@0: if test "$ac_abs_confdir" = "$ac_pwd"; then michael@0: srcdir=. michael@0: fi michael@0: # Remove unnecessary trailing slashes from srcdir. michael@0: # Double slashes in file names in object file debugging info michael@0: # mess up M-x gdb in Emacs. michael@0: @@ -1287,17 +1297,17 @@ michael@0: michael@0: Defaults for the options are specified in brackets. michael@0: michael@0: Configuration: michael@0: -h, --help display this help and exit michael@0: --help=short display options specific to this package michael@0: --help=recursive display the short help of all the included packages michael@0: -V, --version display version information and exit michael@0: - -q, --quiet, --silent do not print \`checking...' messages michael@0: + -q, --quiet, --silent do not print \`checking ...' messages michael@0: --cache-file=FILE cache test results in FILE [disabled] michael@0: -C, --config-cache alias for \`--cache-file=config.cache' michael@0: -n, --no-create do not create output files michael@0: --srcdir=DIR find the sources in DIR [configure dir or \`..'] michael@0: michael@0: Installation directories: michael@0: --prefix=PREFIX install architecture-independent files in PREFIX michael@0: [$ac_default_prefix] michael@0: @@ -1440,19 +1450,19 @@ michael@0: cd "$ac_pwd" || { ac_status=$?; break; } michael@0: done michael@0: fi michael@0: michael@0: test -n "$ac_init_help" && exit $ac_status michael@0: if $ac_init_version; then michael@0: cat <<\_ACEOF michael@0: breakpad configure 0.1 michael@0: -generated by GNU Autoconf 2.65 michael@0: - michael@0: -Copyright (C) 2009 Free Software Foundation, Inc. michael@0: +generated by GNU Autoconf 2.68 michael@0: + michael@0: +Copyright (C) 2010 Free Software Foundation, Inc. michael@0: This configure script is free software; the Free Software Foundation michael@0: gives unlimited permission to copy, distribute and modify it. michael@0: _ACEOF michael@0: exit michael@0: fi michael@0: michael@0: ## ------------------------ ## michael@0: ## Autoconf initialization. ## michael@0: @@ -1486,17 +1496,17 @@ michael@0: } && test -s conftest.$ac_objext; then : michael@0: ac_retval=0 michael@0: else michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: ac_retval=1 michael@0: fi michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: as_fn_set_status $ac_retval michael@0: michael@0: } # ac_fn_c_try_compile michael@0: michael@0: # ac_fn_c_try_cpp LINENO michael@0: # ---------------------- michael@0: # Try to preprocess conftest.$ac_ext, and return whether this succeeded. michael@0: ac_fn_c_try_cpp () michael@0: @@ -1512,28 +1522,28 @@ michael@0: (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err michael@0: ac_status=$? michael@0: if test -s conftest.err; then michael@0: grep -v '^ *+' conftest.err >conftest.er1 michael@0: cat conftest.er1 >&5 michael@0: mv -f conftest.er1 conftest.err michael@0: fi michael@0: $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 michael@0: - test $ac_status = 0; } >/dev/null && { michael@0: + test $ac_status = 0; } > conftest.i && { michael@0: test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || michael@0: test ! -s conftest.err michael@0: }; then : michael@0: ac_retval=0 michael@0: else michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: ac_retval=1 michael@0: fi michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: as_fn_set_status $ac_retval michael@0: michael@0: } # ac_fn_c_try_cpp michael@0: michael@0: # ac_fn_cxx_try_compile LINENO michael@0: # ---------------------------- michael@0: # Try to compile conftest.$ac_ext, and return whether this succeeded. michael@0: ac_fn_cxx_try_compile () michael@0: @@ -1561,17 +1571,17 @@ michael@0: } && test -s conftest.$ac_objext; then : michael@0: ac_retval=0 michael@0: else michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: ac_retval=1 michael@0: fi michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: as_fn_set_status $ac_retval michael@0: michael@0: } # ac_fn_cxx_try_compile michael@0: michael@0: # ac_fn_c_try_run LINENO michael@0: # ---------------------- michael@0: # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes michael@0: # that executables *can* be run. michael@0: @@ -1603,17 +1613,17 @@ michael@0: else michael@0: $as_echo "$as_me: program exited with status $ac_status" >&5 michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: ac_retval=$ac_status michael@0: fi michael@0: rm -rf conftest.dSYM conftest_ipa8_conftest.oo michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: as_fn_set_status $ac_retval michael@0: michael@0: } # ac_fn_c_try_run michael@0: michael@0: # ac_fn_c_try_link LINENO michael@0: # ----------------------- michael@0: # Try to link conftest.$ac_ext, and return whether this succeeded. michael@0: ac_fn_c_try_link () michael@0: @@ -1649,33 +1659,33 @@ michael@0: michael@0: ac_retval=1 michael@0: fi michael@0: # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information michael@0: # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would michael@0: # interfere with the next link command; also delete a directory that is michael@0: # left behind by Apple's compiler. We do this before executing the actions. michael@0: rm -rf conftest.dSYM conftest_ipa8_conftest.oo michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: as_fn_set_status $ac_retval michael@0: michael@0: } # ac_fn_c_try_link michael@0: michael@0: # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES michael@0: # ------------------------------------------------------- michael@0: # Tests whether HEADER exists, giving a warning if it cannot be compiled using michael@0: # the include files in INCLUDES and setting the cache variable VAR michael@0: # accordingly. michael@0: ac_fn_c_check_header_mongrel () michael@0: { michael@0: as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: + if eval \${$3+:} false; then : michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 michael@0: $as_echo_n "checking for $2... " >&6; } michael@0: -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: +if eval \${$3+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: fi michael@0: eval ac_res=\$$3 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 michael@0: $as_echo "$ac_res" >&6; } michael@0: else michael@0: # Is the header compilable? michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 michael@0: @@ -1701,17 +1711,17 @@ michael@0: /* end confdefs.h. */ michael@0: #include <$2> michael@0: _ACEOF michael@0: if ac_fn_c_try_cpp "$LINENO"; then : michael@0: ac_header_preproc=yes michael@0: else michael@0: ac_header_preproc=no michael@0: fi michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.err conftest.i conftest.$ac_ext michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 michael@0: $as_echo "$ac_header_preproc" >&6; } michael@0: michael@0: # So? What about this header? michael@0: case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( michael@0: yes:no: ) michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 michael@0: $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} michael@0: @@ -1724,49 +1734,47 @@ michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 michael@0: $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 michael@0: $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 michael@0: $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 michael@0: $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} michael@0: -( cat <<\_ASBOX michael@0: -## --------------------------------------------------- ## michael@0: +( $as_echo "## --------------------------------------------------- ## michael@0: ## Report this to google-breakpad-dev@googlegroups.com ## michael@0: -## --------------------------------------------------- ## michael@0: -_ASBOX michael@0: +## --------------------------------------------------- ##" michael@0: ) | sed "s/^/$as_me: WARNING: /" >&2 michael@0: ;; michael@0: esac michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 michael@0: $as_echo_n "checking for $2... " >&6; } michael@0: -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: +if eval \${$3+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: eval "$3=\$ac_header_compiler" michael@0: fi michael@0: eval ac_res=\$$3 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 michael@0: $as_echo "$ac_res" >&6; } michael@0: fi michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: michael@0: } # ac_fn_c_check_header_mongrel michael@0: michael@0: # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES michael@0: # ------------------------------------------------------- michael@0: # Tests whether HEADER exists and can be compiled using the include files in michael@0: # INCLUDES, setting the cache variable VAR accordingly. michael@0: ac_fn_c_check_header_compile () michael@0: { michael@0: as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 michael@0: $as_echo_n "checking for $2... " >&6; } michael@0: -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: +if eval \${$3+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: $4 michael@0: #include <$2> michael@0: _ACEOF michael@0: if ac_fn_c_try_compile "$LINENO"; then : michael@0: @@ -1774,25 +1782,25 @@ michael@0: else michael@0: eval "$3=no" michael@0: fi michael@0: rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext michael@0: fi michael@0: eval ac_res=\$$3 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 michael@0: $as_echo "$ac_res" >&6; } michael@0: - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} michael@0: + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno michael@0: michael@0: } # ac_fn_c_check_header_compile michael@0: cat >config.log <<_ACEOF michael@0: This file contains any messages produced by compilers while michael@0: running configure, to aid debugging if configure makes a mistake. michael@0: michael@0: It was created by breakpad $as_me 0.1, which was michael@0: -generated by GNU Autoconf 2.65. Invocation command line was michael@0: +generated by GNU Autoconf 2.68. Invocation command line was michael@0: michael@0: $ $0 $@ michael@0: michael@0: _ACEOF michael@0: exec 5>>config.log michael@0: { michael@0: cat <<_ASUNAME michael@0: ## --------- ## michael@0: @@ -1892,21 +1900,19 @@ michael@0: # would cause problems or look ugly. michael@0: # WARNING: Use '\'' to represent an apostrophe within the trap. michael@0: # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. michael@0: trap 'exit_status=$? michael@0: # Save into config.log some information that might help in debugging. michael@0: { michael@0: echo michael@0: michael@0: - cat <<\_ASBOX michael@0: -## ---------------- ## michael@0: + $as_echo "## ---------------- ## michael@0: ## Cache variables. ## michael@0: -## ---------------- ## michael@0: -_ASBOX michael@0: +## ---------------- ##" michael@0: echo michael@0: # The following way of writing the cache mishandles newlines in values, michael@0: ( michael@0: for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do michael@0: eval ac_val=\$$ac_var michael@0: case $ac_val in #( michael@0: *${as_nl}*) michael@0: case $ac_var in #( michael@0: @@ -1930,56 +1936,50 @@ michael@0: *) michael@0: sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" michael@0: ;; michael@0: esac | michael@0: sort michael@0: ) michael@0: echo michael@0: michael@0: - cat <<\_ASBOX michael@0: -## ----------------- ## michael@0: + $as_echo "## ----------------- ## michael@0: ## Output variables. ## michael@0: -## ----------------- ## michael@0: -_ASBOX michael@0: +## ----------------- ##" michael@0: echo michael@0: for ac_var in $ac_subst_vars michael@0: do michael@0: eval ac_val=\$$ac_var michael@0: case $ac_val in michael@0: *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; michael@0: esac michael@0: $as_echo "$ac_var='\''$ac_val'\''" michael@0: done | sort michael@0: echo michael@0: michael@0: if test -n "$ac_subst_files"; then michael@0: - cat <<\_ASBOX michael@0: -## ------------------- ## michael@0: + $as_echo "## ------------------- ## michael@0: ## File substitutions. ## michael@0: -## ------------------- ## michael@0: -_ASBOX michael@0: +## ------------------- ##" michael@0: echo michael@0: for ac_var in $ac_subst_files michael@0: do michael@0: eval ac_val=\$$ac_var michael@0: case $ac_val in michael@0: *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; michael@0: esac michael@0: $as_echo "$ac_var='\''$ac_val'\''" michael@0: done | sort michael@0: echo michael@0: fi michael@0: michael@0: if test -s confdefs.h; then michael@0: - cat <<\_ASBOX michael@0: -## ----------- ## michael@0: + $as_echo "## ----------- ## michael@0: ## confdefs.h. ## michael@0: -## ----------- ## michael@0: -_ASBOX michael@0: +## ----------- ##" michael@0: echo michael@0: cat confdefs.h michael@0: echo michael@0: fi michael@0: test "$ac_signal" != 0 && michael@0: $as_echo "$as_me: caught signal $ac_signal" michael@0: $as_echo "$as_me: exit $exit_status" michael@0: } >&5 michael@0: @@ -2024,32 +2024,41 @@ michael@0: _ACEOF michael@0: michael@0: michael@0: # Let the site file select an alternate cache file if it wants to. michael@0: # Prefer an explicitly selected file to automatically selected ones. michael@0: ac_site_file1=NONE michael@0: ac_site_file2=NONE michael@0: if test -n "$CONFIG_SITE"; then michael@0: - ac_site_file1=$CONFIG_SITE michael@0: + # We do not want a PATH search for config.site. michael@0: + case $CONFIG_SITE in #(( michael@0: + -*) ac_site_file1=./$CONFIG_SITE;; michael@0: + */*) ac_site_file1=$CONFIG_SITE;; michael@0: + *) ac_site_file1=./$CONFIG_SITE;; michael@0: + esac michael@0: elif test "x$prefix" != xNONE; then michael@0: ac_site_file1=$prefix/share/config.site michael@0: ac_site_file2=$prefix/etc/config.site michael@0: else michael@0: ac_site_file1=$ac_default_prefix/share/config.site michael@0: ac_site_file2=$ac_default_prefix/etc/config.site michael@0: fi michael@0: for ac_site_file in "$ac_site_file1" "$ac_site_file2" michael@0: do michael@0: test "x$ac_site_file" = xNONE && continue michael@0: if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 michael@0: $as_echo "$as_me: loading site script $ac_site_file" >&6;} michael@0: sed 's/^/| /' "$ac_site_file" >&5 michael@0: - . "$ac_site_file" michael@0: + . "$ac_site_file" \ michael@0: + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: +as_fn_error $? "failed to load site script $ac_site_file michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: fi michael@0: done michael@0: michael@0: if test -r "$cache_file"; then michael@0: # Some versions of bash will fail to source /dev/null (special files michael@0: # actually), so we avoid doing that. DJGPP emulates it as a regular file. michael@0: if test /dev/null != "$cache_file" && test -f "$cache_file"; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 michael@0: @@ -2115,77 +2124,83 @@ michael@0: esac michael@0: fi michael@0: done michael@0: if $ac_cache_corrupted; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 michael@0: $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} michael@0: - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 michael@0: + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 michael@0: fi michael@0: ## -------------------- ## michael@0: ## Main body of script. ## michael@0: ## -------------------- ## michael@0: michael@0: ac_ext=c michael@0: ac_cpp='$CPP $CPPFLAGS' michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: michael@0: michael@0: michael@0: ac_aux_dir= michael@0: for ac_dir in autotools "$srcdir"/autotools; do michael@0: - for ac_t in install-sh install.sh shtool; do michael@0: - if test -f "$ac_dir/$ac_t"; then michael@0: - ac_aux_dir=$ac_dir michael@0: - ac_install_sh="$ac_aux_dir/$ac_t -c" michael@0: - break 2 michael@0: - fi michael@0: - done michael@0: + if test -f "$ac_dir/install-sh"; then michael@0: + ac_aux_dir=$ac_dir michael@0: + ac_install_sh="$ac_aux_dir/install-sh -c" michael@0: + break michael@0: + elif test -f "$ac_dir/install.sh"; then michael@0: + ac_aux_dir=$ac_dir michael@0: + ac_install_sh="$ac_aux_dir/install.sh -c" michael@0: + break michael@0: + elif test -f "$ac_dir/shtool"; then michael@0: + ac_aux_dir=$ac_dir michael@0: + ac_install_sh="$ac_aux_dir/shtool install -c" michael@0: + break michael@0: + fi michael@0: done michael@0: if test -z "$ac_aux_dir"; then michael@0: - as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5 michael@0: + as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5 michael@0: fi michael@0: michael@0: # These three variables are undocumented and unsupported, michael@0: # and are intended to be withdrawn in a future Autoconf release. michael@0: # They can cause serious problems if a builder's source tree is in a directory michael@0: # whose full name contains unusual characters. michael@0: ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. michael@0: ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. michael@0: ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. michael@0: michael@0: michael@0: michael@0: # Make sure we can run config.sub. michael@0: $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || michael@0: - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 michael@0: + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 michael@0: $as_echo_n "checking build system type... " >&6; } michael@0: -if test "${ac_cv_build+set}" = set; then : michael@0: +if ${ac_cv_build+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_build_alias=$build_alias michael@0: test "x$ac_build_alias" = x && michael@0: ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` michael@0: test "x$ac_build_alias" = x && michael@0: - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 michael@0: + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 michael@0: ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || michael@0: - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 michael@0: + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 michael@0: michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 michael@0: $as_echo "$ac_cv_build" >&6; } michael@0: case $ac_cv_build in michael@0: *-*-*) ;; michael@0: -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; michael@0: +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; michael@0: esac michael@0: build=$ac_cv_build michael@0: ac_save_IFS=$IFS; IFS='-' michael@0: set x $ac_cv_build michael@0: shift michael@0: build_cpu=$1 michael@0: build_vendor=$2 michael@0: shift; shift michael@0: @@ -2193,32 +2208,32 @@ michael@0: # except with old shells: michael@0: build_os=$* michael@0: IFS=$ac_save_IFS michael@0: case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac michael@0: michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 michael@0: $as_echo_n "checking host system type... " >&6; } michael@0: -if test "${ac_cv_host+set}" = set; then : michael@0: +if ${ac_cv_host+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test "x$host_alias" = x; then michael@0: ac_cv_host=$ac_cv_build michael@0: else michael@0: ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || michael@0: - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 michael@0: + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 michael@0: fi michael@0: michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 michael@0: $as_echo "$ac_cv_host" >&6; } michael@0: case $ac_cv_host in michael@0: *-*-*) ;; michael@0: -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; michael@0: +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; michael@0: esac michael@0: host=$ac_cv_host michael@0: ac_save_IFS=$IFS; IFS='-' michael@0: set x $ac_cv_host michael@0: shift michael@0: host_cpu=$1 michael@0: host_vendor=$2 michael@0: shift; shift michael@0: @@ -2244,17 +2259,17 @@ michael@0: # AFS /usr/afsws/bin/install, which mishandles nonexistent args michael@0: # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" michael@0: # OS/2's system install, which has a completely different semantic michael@0: # ./install, which can be erroneously created by make from ./install.sh. michael@0: # Reject install programs that cannot install multiple files. michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 michael@0: $as_echo_n "checking for a BSD-compatible install... " >&6; } michael@0: if test -z "$INSTALL"; then michael@0: -if test "${ac_cv_path_install+set}" = set; then : michael@0: +if ${ac_cv_path_install+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: IFS=$as_save_IFS michael@0: test -z "$as_dir" && as_dir=. michael@0: # Account for people who put trailing slashes in PATH elements. michael@0: @@ -2331,21 +2346,21 @@ michael@0: sleep 1 michael@0: echo timestamp > conftest.file michael@0: # Reject unsafe characters in $srcdir or the absolute working directory michael@0: # name. Accept space and tab only in the latter. michael@0: am_lf=' michael@0: ' michael@0: case `pwd` in michael@0: *[\\\"\#\$\&\'\`$am_lf]*) michael@0: - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; michael@0: + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; michael@0: esac michael@0: case $srcdir in michael@0: *[\\\"\#\$\&\'\`$am_lf\ \ ]*) michael@0: - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; michael@0: + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; michael@0: esac michael@0: michael@0: # Do `set' in a subshell so we don't clobber the current shell's michael@0: # arguments. Must try -L first in case configure is actually a michael@0: # symlink; some systems play weird games with the mod time of symlinks michael@0: # (eg FreeBSD returns the mod time of the symlink's containing michael@0: # directory). michael@0: if ( michael@0: @@ -2357,27 +2372,27 @@ michael@0: rm -f conftest.file michael@0: if test "$*" != "X $srcdir/configure conftest.file" \ michael@0: && test "$*" != "X conftest.file $srcdir/configure"; then michael@0: michael@0: # If neither matched, then we have a broken ls. This can happen michael@0: # if, for instance, CONFIG_SHELL is bash and it inherits a michael@0: # broken ls alias from the environment. This has actually michael@0: # happened. Such a system could not be considered "sane". michael@0: - as_fn_error "ls -t appears to fail. Make sure there is not a broken michael@0: + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken michael@0: alias in your environment" "$LINENO" 5 michael@0: fi michael@0: michael@0: test "$2" = conftest.file michael@0: ) michael@0: then michael@0: # Ok. michael@0: : michael@0: else michael@0: - as_fn_error "newly created file is older than distributed files! michael@0: + as_fn_error $? "newly created file is older than distributed files! michael@0: Check your system clock" "$LINENO" 5 michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 michael@0: $as_echo "yes" >&6; } michael@0: test "$program_prefix" != NONE && michael@0: program_transform_name="s&^&$program_prefix&;$program_transform_name" michael@0: # Use a double $ so make ignores it. michael@0: test "$program_suffix" != NONE && michael@0: @@ -2421,17 +2436,17 @@ michael@0: # tool to use in cross-compilation environments, therefore Automake michael@0: # will honor the `STRIP' environment variable to overrule this program. michael@0: if test "$cross_compiling" != no; then michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}strip; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_STRIP+set}" = set; then : michael@0: +if ${ac_cv_prog_STRIP+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$STRIP"; then michael@0: ac_cv_prog_STRIP="$STRIP" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2461,17 +2476,17 @@ michael@0: michael@0: fi michael@0: if test -z "$ac_cv_prog_STRIP"; then michael@0: ac_ct_STRIP=$STRIP michael@0: # Extract the first word of "strip", so it can be a program name with args. michael@0: set dummy strip; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_STRIP"; then michael@0: ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2514,17 +2529,17 @@ michael@0: fi michael@0: michael@0: fi michael@0: INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 michael@0: $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } michael@0: if test -z "$MKDIR_P"; then michael@0: - if test "${ac_cv_path_mkdir+set}" = set; then : michael@0: + if ${ac_cv_path_mkdir+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin michael@0: do michael@0: IFS=$as_save_IFS michael@0: test -z "$as_dir" && as_dir=. michael@0: for ac_prog in mkdir gmkdir; do michael@0: @@ -2565,17 +2580,17 @@ michael@0: esac michael@0: michael@0: for ac_prog in gawk mawk nawk awk michael@0: do michael@0: # Extract the first word of "$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_AWK+set}" = set; then : michael@0: +if ${ac_cv_prog_AWK+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$AWK"; then michael@0: ac_cv_prog_AWK="$AWK" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2605,25 +2620,25 @@ michael@0: michael@0: test -n "$AWK" && break michael@0: done michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 michael@0: $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } michael@0: set x ${MAKE-make} michael@0: ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` michael@0: -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat >conftest.make <<\_ACEOF michael@0: SHELL = /bin/sh michael@0: all: michael@0: @echo '@@@%%%=$(MAKE)=@@@%%%' michael@0: _ACEOF michael@0: -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. michael@0: +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. michael@0: case `${MAKE-make} -f conftest.make 2>/dev/null` in michael@0: *@@@%%%=?*=@@@%%%*) michael@0: eval ac_cv_prog_make_${ac_make}_set=yes;; michael@0: *) michael@0: eval ac_cv_prog_make_${ac_make}_set=no;; michael@0: esac michael@0: rm -f conftest.make michael@0: fi michael@0: @@ -2647,17 +2662,17 @@ michael@0: rmdir .tst 2>/dev/null michael@0: michael@0: if test "`cd $srcdir && pwd`" != "`pwd`"; then michael@0: # Use -I$(srcdir) only when $(srcdir) != ., so that make's output michael@0: # is not polluted with repeated "-I." michael@0: am__isrc=' -I$(srcdir)' michael@0: # test to see if srcdir already configured michael@0: if test -f $srcdir/config.status; then michael@0: - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 michael@0: + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 michael@0: fi michael@0: fi michael@0: michael@0: # test whether we have cygpath michael@0: if test -z "$CYGPATH_W"; then michael@0: if (cygpath --version) >/dev/null 2>/dev/null; then michael@0: CYGPATH_W='cygpath -w' michael@0: else michael@0: @@ -2693,19 +2708,19 @@ michael@0: michael@0: AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} michael@0: michael@0: michael@0: MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} michael@0: michael@0: # We need awk for the "check" target. The system "awk" is bad on michael@0: # some platforms. michael@0: -# Always define AMTAR for backward compatibility. michael@0: - michael@0: -AMTAR=${AMTAR-"${am_missing_run}tar"} michael@0: +# Always define AMTAR for backward compatibility. Yes, it's still used michael@0: +# in the wild :-( We should find a proper way to deprecate it ... michael@0: +AMTAR='$${TAR-tar}' michael@0: michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 michael@0: $as_echo_n "checking how to create a ustar tar archive... " >&6; } michael@0: # Loop over all known methods to create a tar archive until one works. michael@0: _am_tools='gnutar plaintar pax cpio none' michael@0: _am_tools=${am_cv_prog_tar_ustar-$_am_tools} michael@0: # Do not fold the above two line into one, because Tru64 sh and michael@0: @@ -2771,17 +2786,17 @@ michael@0: ac_status=$? michael@0: echo "$as_me:$LINENO: \$? = $ac_status" >&5 michael@0: (exit $ac_status); } michael@0: grep GrepMe conftest.dir/file >/dev/null 2>&1 && break michael@0: fi michael@0: done michael@0: rm -rf conftest.dir michael@0: michael@0: -if test "${am_cv_prog_tar_ustar+set}" = set; then : michael@0: +if ${am_cv_prog_tar_ustar+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: am_cv_prog_tar_ustar=$_am_tool michael@0: fi michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 michael@0: $as_echo "$am_cv_prog_tar_ustar" >&6; } michael@0: michael@0: @@ -2839,16 +2854,17 @@ michael@0: # Check whether --enable-dependency-tracking was given. michael@0: if test "${enable_dependency_tracking+set}" = set; then : michael@0: enableval=$enable_dependency_tracking; michael@0: fi michael@0: michael@0: if test "x$enable_dependency_tracking" != xno; then michael@0: am_depcomp="$ac_aux_dir/depcomp" michael@0: AMDEPBACKSLASH='\' michael@0: + am__nodep='_no' michael@0: fi michael@0: if test "x$enable_dependency_tracking" != xno; then michael@0: AMDEP_TRUE= michael@0: AMDEP_FALSE='#' michael@0: else michael@0: AMDEP_TRUE='#' michael@0: AMDEP_FALSE= michael@0: fi michael@0: @@ -2859,17 +2875,17 @@ michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}gcc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2899,17 +2915,17 @@ michael@0: michael@0: fi michael@0: if test -z "$ac_cv_prog_CC"; then michael@0: ac_ct_CC=$CC michael@0: # Extract the first word of "gcc", so it can be a program name with args. michael@0: set dummy gcc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_CC"; then michael@0: ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2952,17 +2968,17 @@ michael@0: fi michael@0: michael@0: if test -z "$CC"; then michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}cc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -2992,17 +3008,17 @@ michael@0: michael@0: fi michael@0: fi michael@0: if test -z "$CC"; then michael@0: # Extract the first word of "cc", so it can be a program name with args. michael@0: set dummy cc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: ac_prog_rejected=no michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: @@ -3051,17 +3067,17 @@ michael@0: if test -z "$CC"; then michael@0: if test -n "$ac_tool_prefix"; then michael@0: for ac_prog in cl.exe michael@0: do michael@0: # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_tool_prefix$ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -3095,17 +3111,17 @@ michael@0: if test -z "$CC"; then michael@0: ac_ct_CC=$CC michael@0: for ac_prog in cl.exe michael@0: do michael@0: # Extract the first word of "$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_CC"; then michael@0: ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -3149,18 +3165,18 @@ michael@0: fi michael@0: fi michael@0: michael@0: fi michael@0: michael@0: michael@0: test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "no acceptable C compiler found in \$PATH michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +as_fn_error $? "no acceptable C compiler found in \$PATH michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: michael@0: # Provide some information about the compiler. michael@0: $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 michael@0: set X $ac_compile michael@0: ac_compiler=$2 michael@0: for ac_option in --version -v -V -qversion; do michael@0: { { ac_try="$ac_compiler $ac_option >&5" michael@0: case "(($ac_try" in michael@0: @@ -3264,19 +3280,18 @@ michael@0: if test -z "$ac_file"; then : michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 michael@0: $as_echo "no" >&6; } michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -{ as_fn_set_status 77 michael@0: -as_fn_error "C compiler cannot create executables michael@0: -See \`config.log' for more details." "$LINENO" 5; }; } michael@0: +as_fn_error 77 "C compiler cannot create executables michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: else michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 michael@0: $as_echo "yes" >&6; } michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 michael@0: $as_echo_n "checking for C compiler default output file name... " >&6; } michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 michael@0: $as_echo "$ac_file" >&6; } michael@0: @@ -3308,18 +3323,18 @@ michael@0: *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` michael@0: break;; michael@0: * ) break;; michael@0: esac michael@0: done michael@0: else michael@0: { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "cannot compute suffix of executables: cannot compile and link michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +as_fn_error $? "cannot compute suffix of executables: cannot compile and link michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: fi michael@0: rm -f conftest conftest$ac_cv_exeext michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 michael@0: $as_echo "$ac_cv_exeext" >&6; } michael@0: michael@0: rm -f conftest.$ac_ext michael@0: EXEEXT=$ac_cv_exeext michael@0: ac_exeext=$EXEEXT michael@0: @@ -3366,30 +3381,30 @@ michael@0: test $ac_status = 0; }; }; then michael@0: cross_compiling=no michael@0: else michael@0: if test "$cross_compiling" = maybe; then michael@0: cross_compiling=yes michael@0: else michael@0: { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "cannot run C compiled programs. michael@0: +as_fn_error $? "cannot run C compiled programs. michael@0: If you meant to cross compile, use \`--host'. michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: fi michael@0: fi michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 michael@0: $as_echo "$cross_compiling" >&6; } michael@0: michael@0: rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out michael@0: ac_clean_files=$ac_clean_files_save michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 michael@0: $as_echo_n "checking for suffix of object files... " >&6; } michael@0: -if test "${ac_cv_objext+set}" = set; then : michael@0: +if ${ac_cv_objext+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: michael@0: int michael@0: main () michael@0: { michael@0: @@ -3419,28 +3434,28 @@ michael@0: esac michael@0: done michael@0: else michael@0: $as_echo "$as_me: failed program was:" >&5 michael@0: sed 's/^/| /' conftest.$ac_ext >&5 michael@0: michael@0: { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "cannot compute suffix of object files: cannot compile michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +as_fn_error $? "cannot compute suffix of object files: cannot compile michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: fi michael@0: rm -f conftest.$ac_cv_objext conftest.$ac_ext michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 michael@0: $as_echo "$ac_cv_objext" >&6; } michael@0: OBJEXT=$ac_cv_objext michael@0: ac_objext=$OBJEXT michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 michael@0: $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } michael@0: -if test "${ac_cv_c_compiler_gnu+set}" = set; then : michael@0: +if ${ac_cv_c_compiler_gnu+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: michael@0: int michael@0: main () michael@0: { michael@0: @@ -3467,17 +3482,17 @@ michael@0: GCC=yes michael@0: else michael@0: GCC= michael@0: fi michael@0: ac_test_CFLAGS=${CFLAGS+set} michael@0: ac_save_CFLAGS=$CFLAGS michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 michael@0: $as_echo_n "checking whether $CC accepts -g... " >&6; } michael@0: -if test "${ac_cv_prog_cc_g+set}" = set; then : michael@0: +if ${ac_cv_prog_cc_g+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_save_c_werror_flag=$ac_c_werror_flag michael@0: ac_c_werror_flag=yes michael@0: ac_cv_prog_cc_g=no michael@0: CFLAGS="-g" michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: @@ -3545,17 +3560,17 @@ michael@0: if test "$GCC" = yes; then michael@0: CFLAGS="-O2" michael@0: else michael@0: CFLAGS= michael@0: fi michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 michael@0: $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } michael@0: -if test "${ac_cv_prog_cc_c89+set}" = set; then : michael@0: +if ${ac_cv_prog_cc_c89+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_cv_prog_cc_c89=no michael@0: ac_save_CC=$CC michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: #include michael@0: #include michael@0: @@ -3644,25 +3659,26 @@ michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: michael@0: depcc="$CC" am_compiler_list= michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 michael@0: $as_echo_n "checking dependency style of $depcc... " >&6; } michael@0: -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : michael@0: +if ${am_cv_CC_dependencies_compiler_type+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then michael@0: # We make a subdir and do the tests there. Otherwise we can end up michael@0: # making bogus files that we don't know about and never remove. For michael@0: # instance it was reported that on HP-UX the gcc test will end up michael@0: # making a dummy file named `D' -- because `-MD' means `put the output michael@0: # in D'. michael@0: + rm -rf conftest.dir michael@0: mkdir conftest.dir michael@0: # Copy depcomp to subdir because otherwise we won't find it if we're michael@0: # using a relative directory. michael@0: cp "$am_depcomp" conftest.dir michael@0: cd conftest.dir michael@0: # We will build objects and dependencies in a subdirectory because michael@0: # it helps to detect inapplicable dependency modes. For instance michael@0: # both Tru64's cc and ICC support -MD to output dependencies as a michael@0: @@ -3712,17 +3728,17 @@ michael@0: # after this tag, mechanisms are not by side-effect, so they'll michael@0: # only be used when explicitly requested michael@0: if test "x$enable_dependency_tracking" = xyes; then michael@0: continue michael@0: else michael@0: break michael@0: fi michael@0: ;; michael@0: - msvisualcpp | msvcmsys) michael@0: + msvc7 | msvc7msys | msvisualcpp | msvcmsys) michael@0: # This compiler won't grok `-c -o', but also, the minuso test has michael@0: # not run yet. These depmodes are late enough in the game, and michael@0: # so weak that their functioning should not be impacted. michael@0: am__obj=conftest.${OBJEXT-o} michael@0: am__minus_obj= michael@0: ;; michael@0: none) break ;; michael@0: esac michael@0: @@ -3778,25 +3794,26 @@ michael@0: test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS michael@0: michael@0: michael@0: michael@0: depcc="$CCAS" am_compiler_list= michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 michael@0: $as_echo_n "checking dependency style of $depcc... " >&6; } michael@0: -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : michael@0: +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then michael@0: # We make a subdir and do the tests there. Otherwise we can end up michael@0: # making bogus files that we don't know about and never remove. For michael@0: # instance it was reported that on HP-UX the gcc test will end up michael@0: # making a dummy file named `D' -- because `-MD' means `put the output michael@0: # in D'. michael@0: + rm -rf conftest.dir michael@0: mkdir conftest.dir michael@0: # Copy depcomp to subdir because otherwise we won't find it if we're michael@0: # using a relative directory. michael@0: cp "$am_depcomp" conftest.dir michael@0: cd conftest.dir michael@0: # We will build objects and dependencies in a subdirectory because michael@0: # it helps to detect inapplicable dependency modes. For instance michael@0: # both Tru64's cc and ICC support -MD to output dependencies as a michael@0: @@ -3844,17 +3861,17 @@ michael@0: # after this tag, mechanisms are not by side-effect, so they'll michael@0: # only be used when explicitly requested michael@0: if test "x$enable_dependency_tracking" = xyes; then michael@0: continue michael@0: else michael@0: break michael@0: fi michael@0: ;; michael@0: - msvisualcpp | msvcmsys) michael@0: + msvc7 | msvc7msys | msvisualcpp | msvcmsys) michael@0: # This compiler won't grok `-c -o', but also, the minuso test has michael@0: # not run yet. These depmodes are late enough in the game, and michael@0: # so weak that their functioning should not be impacted. michael@0: am__obj=conftest.${OBJEXT-o} michael@0: am__minus_obj= michael@0: ;; michael@0: none) break ;; michael@0: esac michael@0: @@ -3909,17 +3926,17 @@ michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}gcc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -3949,17 +3966,17 @@ michael@0: michael@0: fi michael@0: if test -z "$ac_cv_prog_CC"; then michael@0: ac_ct_CC=$CC michael@0: # Extract the first word of "gcc", so it can be a program name with args. michael@0: set dummy gcc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_CC"; then michael@0: ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4002,17 +4019,17 @@ michael@0: fi michael@0: michael@0: if test -z "$CC"; then michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}cc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4042,17 +4059,17 @@ michael@0: michael@0: fi michael@0: fi michael@0: if test -z "$CC"; then michael@0: # Extract the first word of "cc", so it can be a program name with args. michael@0: set dummy cc; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: ac_prog_rejected=no michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: @@ -4101,17 +4118,17 @@ michael@0: if test -z "$CC"; then michael@0: if test -n "$ac_tool_prefix"; then michael@0: for ac_prog in cl.exe michael@0: do michael@0: # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_tool_prefix$ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CC"; then michael@0: ac_cv_prog_CC="$CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4145,17 +4162,17 @@ michael@0: if test -z "$CC"; then michael@0: ac_ct_CC=$CC michael@0: for ac_prog in cl.exe michael@0: do michael@0: # Extract the first word of "$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_CC"; then michael@0: ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4199,18 +4216,18 @@ michael@0: fi michael@0: fi michael@0: michael@0: fi michael@0: michael@0: michael@0: test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "no acceptable C compiler found in \$PATH michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +as_fn_error $? "no acceptable C compiler found in \$PATH michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: michael@0: # Provide some information about the compiler. michael@0: $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 michael@0: set X $ac_compile michael@0: ac_compiler=$2 michael@0: for ac_option in --version -v -V -qversion; do michael@0: { { ac_try="$ac_compiler $ac_option >&5" michael@0: case "(($ac_try" in michael@0: @@ -4229,17 +4246,17 @@ michael@0: fi michael@0: rm -f conftest.er1 conftest.err michael@0: $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 michael@0: test $ac_status = 0; } michael@0: done michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 michael@0: $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } michael@0: -if test "${ac_cv_c_compiler_gnu+set}" = set; then : michael@0: +if ${ac_cv_c_compiler_gnu+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: michael@0: int michael@0: main () michael@0: { michael@0: @@ -4266,17 +4283,17 @@ michael@0: GCC=yes michael@0: else michael@0: GCC= michael@0: fi michael@0: ac_test_CFLAGS=${CFLAGS+set} michael@0: ac_save_CFLAGS=$CFLAGS michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 michael@0: $as_echo_n "checking whether $CC accepts -g... " >&6; } michael@0: -if test "${ac_cv_prog_cc_g+set}" = set; then : michael@0: +if ${ac_cv_prog_cc_g+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_save_c_werror_flag=$ac_c_werror_flag michael@0: ac_c_werror_flag=yes michael@0: ac_cv_prog_cc_g=no michael@0: CFLAGS="-g" michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: @@ -4344,17 +4361,17 @@ michael@0: if test "$GCC" = yes; then michael@0: CFLAGS="-O2" michael@0: else michael@0: CFLAGS= michael@0: fi michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 michael@0: $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } michael@0: -if test "${ac_cv_prog_cc_c89+set}" = set; then : michael@0: +if ${ac_cv_prog_cc_c89+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_cv_prog_cc_c89=no michael@0: ac_save_CC=$CC michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: #include michael@0: #include michael@0: @@ -4443,25 +4460,26 @@ michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: michael@0: depcc="$CC" am_compiler_list= michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 michael@0: $as_echo_n "checking dependency style of $depcc... " >&6; } michael@0: -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : michael@0: +if ${am_cv_CC_dependencies_compiler_type+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then michael@0: # We make a subdir and do the tests there. Otherwise we can end up michael@0: # making bogus files that we don't know about and never remove. For michael@0: # instance it was reported that on HP-UX the gcc test will end up michael@0: # making a dummy file named `D' -- because `-MD' means `put the output michael@0: # in D'. michael@0: + rm -rf conftest.dir michael@0: mkdir conftest.dir michael@0: # Copy depcomp to subdir because otherwise we won't find it if we're michael@0: # using a relative directory. michael@0: cp "$am_depcomp" conftest.dir michael@0: cd conftest.dir michael@0: # We will build objects and dependencies in a subdirectory because michael@0: # it helps to detect inapplicable dependency modes. For instance michael@0: # both Tru64's cc and ICC support -MD to output dependencies as a michael@0: @@ -4511,17 +4529,17 @@ michael@0: # after this tag, mechanisms are not by side-effect, so they'll michael@0: # only be used when explicitly requested michael@0: if test "x$enable_dependency_tracking" = xyes; then michael@0: continue michael@0: else michael@0: break michael@0: fi michael@0: ;; michael@0: - msvisualcpp | msvcmsys) michael@0: + msvc7 | msvc7msys | msvisualcpp | msvcmsys) michael@0: # This compiler won't grok `-c -o', but also, the minuso test has michael@0: # not run yet. These depmodes are late enough in the game, and michael@0: # so weak that their functioning should not be impacted. michael@0: am__obj=conftest.${OBJEXT-o} michael@0: am__minus_obj= michael@0: ;; michael@0: none) break ;; michael@0: esac michael@0: @@ -4575,17 +4593,17 @@ michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 michael@0: $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } michael@0: else michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 michael@0: $as_echo_n "checking whether cc understands -c and -o together... " >&6; } michael@0: fi michael@0: set dummy $CC; ac_cc=`$as_echo "$2" | michael@0: sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` michael@0: -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : michael@0: +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: michael@0: int michael@0: main () michael@0: { michael@0: @@ -4704,17 +4722,17 @@ michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 michael@0: $as_echo_n "checking how to run the C preprocessor... " >&6; } michael@0: # On Suns, sometimes $CPP names a directory. michael@0: if test -n "$CPP" && test -d "$CPP"; then michael@0: CPP= michael@0: fi michael@0: if test -z "$CPP"; then michael@0: - if test "${ac_cv_prog_CPP+set}" = set; then : michael@0: + if ${ac_cv_prog_CPP+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: # Double quotes because CPP needs to be expanded michael@0: for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" michael@0: do michael@0: ac_preproc_ok=false michael@0: for ac_c_preproc_warn_flag in '' yes michael@0: do michael@0: @@ -4734,37 +4752,37 @@ michael@0: Syntax error michael@0: _ACEOF michael@0: if ac_fn_c_try_cpp "$LINENO"; then : michael@0: michael@0: else michael@0: # Broken: fails on valid input. michael@0: continue michael@0: fi michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.err conftest.i conftest.$ac_ext michael@0: michael@0: # OK, works on sane cases. Now check whether nonexistent headers michael@0: # can be detected and how. michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: #include michael@0: _ACEOF michael@0: if ac_fn_c_try_cpp "$LINENO"; then : michael@0: # Broken: success on invalid input. michael@0: continue michael@0: else michael@0: # Passes both tests. michael@0: ac_preproc_ok=: michael@0: break michael@0: fi michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.err conftest.i conftest.$ac_ext michael@0: michael@0: done michael@0: # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.i conftest.err conftest.$ac_ext michael@0: if $ac_preproc_ok; then : michael@0: break michael@0: fi michael@0: michael@0: done michael@0: ac_cv_prog_CPP=$CPP michael@0: michael@0: fi michael@0: @@ -4793,44 +4811,44 @@ michael@0: Syntax error michael@0: _ACEOF michael@0: if ac_fn_c_try_cpp "$LINENO"; then : michael@0: michael@0: else michael@0: # Broken: fails on valid input. michael@0: continue michael@0: fi michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.err conftest.i conftest.$ac_ext michael@0: michael@0: # OK, works on sane cases. Now check whether nonexistent headers michael@0: # can be detected and how. michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: #include michael@0: _ACEOF michael@0: if ac_fn_c_try_cpp "$LINENO"; then : michael@0: # Broken: success on invalid input. michael@0: continue michael@0: else michael@0: # Passes both tests. michael@0: ac_preproc_ok=: michael@0: break michael@0: fi michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.err conftest.i conftest.$ac_ext michael@0: michael@0: done michael@0: # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. michael@0: -rm -f conftest.err conftest.$ac_ext michael@0: +rm -f conftest.i conftest.err conftest.$ac_ext michael@0: if $ac_preproc_ok; then : michael@0: michael@0: else michael@0: { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@0: $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@0: -as_fn_error "C preprocessor \"$CPP\" fails sanity check michael@0: -See \`config.log' for more details." "$LINENO" 5; } michael@0: +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check michael@0: +See \`config.log' for more details" "$LINENO" 5; } michael@0: fi michael@0: michael@0: ac_ext=c michael@0: ac_cpp='$CPP $CPPFLAGS' michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: michael@0: @@ -4845,17 +4863,17 @@ michael@0: else michael@0: if test -n "$ac_tool_prefix"; then michael@0: for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC michael@0: do michael@0: # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_tool_prefix$ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_CXX+set}" = set; then : michael@0: +if ${ac_cv_prog_CXX+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$CXX"; then michael@0: ac_cv_prog_CXX="$CXX" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4889,17 +4907,17 @@ michael@0: if test -z "$CXX"; then michael@0: ac_ct_CXX=$CXX michael@0: for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC michael@0: do michael@0: # Extract the first word of "$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_CXX+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_CXX"; then michael@0: ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -4967,17 +4985,17 @@ michael@0: fi michael@0: rm -f conftest.er1 conftest.err michael@0: $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 michael@0: test $ac_status = 0; } michael@0: done michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 michael@0: $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } michael@0: -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : michael@0: +if ${ac_cv_cxx_compiler_gnu+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: michael@0: int michael@0: main () michael@0: { michael@0: @@ -5004,17 +5022,17 @@ michael@0: GXX=yes michael@0: else michael@0: GXX= michael@0: fi michael@0: ac_test_CXXFLAGS=${CXXFLAGS+set} michael@0: ac_save_CXXFLAGS=$CXXFLAGS michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 michael@0: $as_echo_n "checking whether $CXX accepts -g... " >&6; } michael@0: -if test "${ac_cv_prog_cxx_g+set}" = set; then : michael@0: +if ${ac_cv_prog_cxx_g+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: ac_save_cxx_werror_flag=$ac_cxx_werror_flag michael@0: ac_cxx_werror_flag=yes michael@0: ac_cv_prog_cxx_g=no michael@0: CXXFLAGS="-g" michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: @@ -5090,25 +5108,26 @@ michael@0: ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' michael@0: ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' michael@0: ac_compiler_gnu=$ac_cv_c_compiler_gnu michael@0: michael@0: depcc="$CXX" am_compiler_list= michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 michael@0: $as_echo_n "checking dependency style of $depcc... " >&6; } michael@0: -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : michael@0: +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then michael@0: # We make a subdir and do the tests there. Otherwise we can end up michael@0: # making bogus files that we don't know about and never remove. For michael@0: # instance it was reported that on HP-UX the gcc test will end up michael@0: # making a dummy file named `D' -- because `-MD' means `put the output michael@0: # in D'. michael@0: + rm -rf conftest.dir michael@0: mkdir conftest.dir michael@0: # Copy depcomp to subdir because otherwise we won't find it if we're michael@0: # using a relative directory. michael@0: cp "$am_depcomp" conftest.dir michael@0: cd conftest.dir michael@0: # We will build objects and dependencies in a subdirectory because michael@0: # it helps to detect inapplicable dependency modes. For instance michael@0: # both Tru64's cc and ICC support -MD to output dependencies as a michael@0: @@ -5158,17 +5177,17 @@ michael@0: # after this tag, mechanisms are not by side-effect, so they'll michael@0: # only be used when explicitly requested michael@0: if test "x$enable_dependency_tracking" = xyes; then michael@0: continue michael@0: else michael@0: break michael@0: fi michael@0: ;; michael@0: - msvisualcpp | msvcmsys) michael@0: + msvc7 | msvc7msys | msvisualcpp | msvcmsys) michael@0: # This compiler won't grok `-c -o', but also, the minuso test has michael@0: # not run yet. These depmodes are late enough in the game, and michael@0: # so weak that their functioning should not be impacted. michael@0: am__obj=conftest.${OBJEXT-o} michael@0: am__minus_obj= michael@0: ;; michael@0: none) break ;; michael@0: esac michael@0: @@ -5218,17 +5237,17 @@ michael@0: fi michael@0: michael@0: michael@0: if test -n "$ac_tool_prefix"; then michael@0: # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. michael@0: set dummy ${ac_tool_prefix}ranlib; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_RANLIB+set}" = set; then : michael@0: +if ${ac_cv_prog_RANLIB+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$RANLIB"; then michael@0: ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -5258,17 +5277,17 @@ michael@0: michael@0: fi michael@0: if test -z "$ac_cv_prog_RANLIB"; then michael@0: ac_ct_RANLIB=$RANLIB michael@0: # Extract the first word of "ranlib", so it can be a program name with args. michael@0: set dummy ranlib; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : michael@0: +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ac_ct_RANLIB"; then michael@0: ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -5318,17 +5337,17 @@ michael@0: GCC_FALSE= michael@0: fi michael@0: # let the Makefile know if we're gcc michael@0: michael@0: michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 michael@0: $as_echo_n "checking for grep that handles long lines and -e... " >&6; } michael@0: -if test "${ac_cv_path_GREP+set}" = set; then : michael@0: +if ${ac_cv_path_GREP+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -z "$GREP"; then michael@0: ac_path_GREP_found=false michael@0: # Loop through the user's path and test for each of PROGNAME-LIST michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin michael@0: do michael@0: @@ -5367,31 +5386,31 @@ michael@0: esac michael@0: michael@0: $ac_path_GREP_found && break 3 michael@0: done michael@0: done michael@0: done michael@0: IFS=$as_save_IFS michael@0: if test -z "$ac_cv_path_GREP"; then michael@0: - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 michael@0: + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 michael@0: fi michael@0: else michael@0: ac_cv_path_GREP=$GREP michael@0: fi michael@0: michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 michael@0: $as_echo "$ac_cv_path_GREP" >&6; } michael@0: GREP="$ac_cv_path_GREP" michael@0: michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 michael@0: $as_echo_n "checking for egrep... " >&6; } michael@0: -if test "${ac_cv_path_EGREP+set}" = set; then : michael@0: +if ${ac_cv_path_EGREP+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 michael@0: then ac_cv_path_EGREP="$GREP -E" michael@0: else michael@0: if test -z "$EGREP"; then michael@0: ac_path_EGREP_found=false michael@0: # Loop through the user's path and test for each of PROGNAME-LIST michael@0: @@ -5433,32 +5452,32 @@ michael@0: esac michael@0: michael@0: $ac_path_EGREP_found && break 3 michael@0: done michael@0: done michael@0: done michael@0: IFS=$as_save_IFS michael@0: if test -z "$ac_cv_path_EGREP"; then michael@0: - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 michael@0: + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 michael@0: fi michael@0: else michael@0: ac_cv_path_EGREP=$EGREP michael@0: fi michael@0: michael@0: fi michael@0: fi michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 michael@0: $as_echo "$ac_cv_path_EGREP" >&6; } michael@0: EGREP="$ac_cv_path_EGREP" michael@0: michael@0: michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 michael@0: $as_echo_n "checking for ANSI C header files... " >&6; } michael@0: -if test "${ac_cv_header_stdc+set}" = set; then : michael@0: +if ${ac_cv_header_stdc+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: cat confdefs.h - <<_ACEOF >conftest.$ac_ext michael@0: /* end confdefs.h. */ michael@0: #include michael@0: #include michael@0: #include michael@0: #include michael@0: @@ -5785,17 +5804,17 @@ michael@0: PTHREAD_CFLAGS="$flag" michael@0: ;; michael@0: michael@0: pthread-config) michael@0: # Extract the first word of "pthread-config", so it can be a program name with args. michael@0: set dummy pthread-config; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_ax_pthread_config+set}" = set; then : michael@0: +if ${ac_cv_prog_ax_pthread_config+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$ax_pthread_config"; then michael@0: ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -5946,17 +5965,17 @@ michael@0: # More AIX lossage: must compile with xlc_r or cc_r michael@0: if test x"$GCC" != xyes; then michael@0: for ac_prog in xlc_r cc_r michael@0: do michael@0: # Extract the first word of "$ac_prog", so it can be a program name with args. michael@0: set dummy $ac_prog; ac_word=$2 michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 michael@0: $as_echo_n "checking for $ac_word... " >&6; } michael@0: -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : michael@0: +if ${ac_cv_prog_PTHREAD_CC+:} false; then : michael@0: $as_echo_n "(cached) " >&6 michael@0: else michael@0: if test -n "$PTHREAD_CC"; then michael@0: ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. michael@0: else michael@0: as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: @@ -6018,31 +6037,30 @@ michael@0: michael@0: # On IRIX 5.3, sys/types and inttypes.h are conflicting. michael@0: for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ michael@0: inttypes.h stdint.h unistd.h michael@0: do : michael@0: as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` michael@0: ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default michael@0: " michael@0: -eval as_val=\$$as_ac_Header michael@0: - if test "x$as_val" = x""yes; then : michael@0: +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : michael@0: cat >>confdefs.h <<_ACEOF michael@0: #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 michael@0: _ACEOF michael@0: michael@0: fi michael@0: michael@0: done michael@0: michael@0: michael@0: for ac_header in a.out.h michael@0: do : michael@0: ac_fn_c_check_header_mongrel "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default" michael@0: -if test "x$ac_cv_header_a_out_h" = x""yes; then : michael@0: +if test "x$ac_cv_header_a_out_h" = xyes; then : michael@0: cat >>confdefs.h <<_ACEOF michael@0: #define HAVE_A_OUT_H 1 michael@0: _ACEOF michael@0: michael@0: fi michael@0: michael@0: done michael@0: michael@0: @@ -6084,17 +6102,17 @@ michael@0: CFLAGS="${CFLAGS} -m32" michael@0: CXXFLAGS="${CXXFLAGS} -m32" michael@0: usem32=true michael@0: ;; michael@0: no) michael@0: usem32=false michael@0: ;; michael@0: *) michael@0: - as_fn_error "bad value ${enableval} for --enable-m32" "$LINENO" 5 michael@0: + as_fn_error $? "bad value ${enableval} for --enable-m32" "$LINENO" 5 michael@0: ;; michael@0: esac michael@0: else michael@0: usem32=false michael@0: fi michael@0: michael@0: michael@0: # Check whether --enable-processor was given. michael@0: @@ -6102,17 +6120,17 @@ michael@0: enableval=$enable_processor; case "${enableval}" in michael@0: yes) michael@0: disable_processor=false michael@0: ;; michael@0: no) michael@0: disable_processor=true michael@0: ;; michael@0: *) michael@0: - as_fn_error "bad value ${enableval} for --disable-processor" "$LINENO" 5 michael@0: + as_fn_error $? "bad value ${enableval} for --disable-processor" "$LINENO" 5 michael@0: ;; michael@0: esac michael@0: else michael@0: disable_processor=false michael@0: fi michael@0: michael@0: if test x$disable_processor = xtrue; then michael@0: DISABLE_PROCESSOR_TRUE= michael@0: @@ -6128,47 +6146,47 @@ michael@0: enableval=$enable_tools; case "${enableval}" in michael@0: yes) michael@0: disable_tools=false michael@0: ;; michael@0: no) michael@0: disable_tools=true michael@0: ;; michael@0: *) michael@0: - as_fn_error "bad value ${enableval} for --disable-tools" "$LINENO" 5 michael@0: + as_fn_error $? "bad value ${enableval} for --disable-tools" "$LINENO" 5 michael@0: ;; michael@0: esac michael@0: else michael@0: disable_tools=false michael@0: fi michael@0: michael@0: if test x$disable_tools = xtrue; then michael@0: DISABLE_TOOLS_TRUE= michael@0: DISABLE_TOOLS_FALSE='#' michael@0: else michael@0: DISABLE_TOOLS_TRUE='#' michael@0: DISABLE_TOOLS_FALSE= michael@0: fi michael@0: michael@0: michael@0: if test x$LINUX_HOST = xfalse -a x$disable_processor = xtrue -a x$disable_tools = xtrue; then michael@0: - as_fn_error "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5 michael@0: + as_fn_error $? "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5 michael@0: fi michael@0: michael@0: # Check whether --enable-selftest was given. michael@0: if test "${enable_selftest+set}" = set; then : michael@0: enableval=$enable_selftest; case "${enableval}" in michael@0: yes) michael@0: selftest=true michael@0: ;; michael@0: no) michael@0: selftest=false michael@0: ;; michael@0: *) michael@0: - as_fn_error "bad value ${enableval} for --enable-selftest" "$LINENO" 5 michael@0: + as_fn_error $? "bad value ${enableval} for --enable-selftest" "$LINENO" 5 michael@0: ;; michael@0: esac michael@0: else michael@0: selftest=false michael@0: fi michael@0: michael@0: if test x$selftest = xtrue; then michael@0: SELFTEST_TRUE= michael@0: @@ -6240,35 +6258,47 @@ michael@0: t clear michael@0: :clear michael@0: s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ michael@0: t end michael@0: s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ michael@0: :end' >>confcache michael@0: if diff "$cache_file" confcache >/dev/null 2>&1; then :; else michael@0: if test -w "$cache_file"; then michael@0: - test "x$cache_file" != "x/dev/null" && michael@0: + if test "x$cache_file" != "x/dev/null"; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 michael@0: $as_echo "$as_me: updating cache $cache_file" >&6;} michael@0: - cat confcache >$cache_file michael@0: + if test ! -f "$cache_file" || test -h "$cache_file"; then michael@0: + cat confcache >"$cache_file" michael@0: + else michael@0: + case $cache_file in #( michael@0: + */* | ?:*) michael@0: + mv -f confcache "$cache_file"$$ && michael@0: + mv -f "$cache_file"$$ "$cache_file" ;; #( michael@0: + *) michael@0: + mv -f confcache "$cache_file" ;; michael@0: + esac michael@0: + fi michael@0: + fi michael@0: else michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 michael@0: $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} michael@0: fi michael@0: fi michael@0: rm -f confcache michael@0: michael@0: test "x$prefix" = xNONE && prefix=$ac_default_prefix michael@0: # Let make expand exec_prefix. michael@0: test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' michael@0: michael@0: DEFS=-DHAVE_CONFIG_H michael@0: michael@0: ac_libobjs= michael@0: ac_ltlibobjs= michael@0: +U= michael@0: for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue michael@0: # 1. Remove the extension, and $U if already installed. michael@0: ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' michael@0: ac_i=`$as_echo "$ac_i" | sed "$ac_script"` michael@0: # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR michael@0: # will be set to the directory where LIBOBJS objects are built. michael@0: as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" michael@0: as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' michael@0: @@ -6282,61 +6312,61 @@ michael@0: am__EXEEXT_TRUE= michael@0: am__EXEEXT_FALSE='#' michael@0: else michael@0: am__EXEEXT_TRUE='#' michael@0: am__EXEEXT_FALSE= michael@0: fi michael@0: michael@0: if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then michael@0: - as_fn_error "conditional \"AMDEP\" was never defined. michael@0: + as_fn_error $? "conditional \"AMDEP\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then michael@0: - as_fn_error "conditional \"am__fastdepCC\" was never defined. michael@0: + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then michael@0: - as_fn_error "conditional \"am__fastdepCCAS\" was never defined. michael@0: + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then michael@0: - as_fn_error "conditional \"am__fastdepCC\" was never defined. michael@0: + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then michael@0: - as_fn_error "conditional \"am__fastdepCXX\" was never defined. michael@0: + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then michael@0: - as_fn_error "conditional \"GCC\" was never defined. michael@0: + as_fn_error $? "conditional \"GCC\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then michael@0: - as_fn_error "conditional \"LINUX_HOST\" was never defined. michael@0: + as_fn_error $? "conditional \"LINUX_HOST\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then michael@0: - as_fn_error "conditional \"ANDROID_HOST\" was never defined. michael@0: + as_fn_error $? "conditional \"ANDROID_HOST\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then michael@0: - as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined. michael@0: + as_fn_error $? "conditional \"DISABLE_PROCESSOR\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${DISABLE_TOOLS_TRUE}" && test -z "${DISABLE_TOOLS_FALSE}"; then michael@0: - as_fn_error "conditional \"DISABLE_TOOLS\" was never defined. michael@0: + as_fn_error $? "conditional \"DISABLE_TOOLS\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: if test -z "${SELFTEST_TRUE}" && test -z "${SELFTEST_FALSE}"; then michael@0: - as_fn_error "conditional \"SELFTEST\" was never defined. michael@0: + as_fn_error $? "conditional \"SELFTEST\" was never defined. michael@0: Usually this means the macro was only invoked conditionally." "$LINENO" 5 michael@0: fi michael@0: michael@0: -: ${CONFIG_STATUS=./config.status} michael@0: +: "${CONFIG_STATUS=./config.status}" michael@0: ac_write_fail=0 michael@0: ac_clean_files_save=$ac_clean_files michael@0: ac_clean_files="$ac_clean_files $CONFIG_STATUS" michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 michael@0: $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} michael@0: as_write_fail=0 michael@0: cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 michael@0: #! $SHELL michael@0: @@ -6427,16 +6457,17 @@ michael@0: # IFS michael@0: # We need space, tab and new line, in precisely that order. Quoting is michael@0: # there to prevent editors from complaining about space-tab. michael@0: # (If _AS_PATH_WALK were called with IFS unset, it would disable word michael@0: # splitting by setting IFS to empty value.) michael@0: IFS=" "" $as_nl" michael@0: michael@0: # Find who we are. Look in the path if we contain no directory separator. michael@0: +as_myself= michael@0: case $0 in #(( michael@0: *[\\/]* ) as_myself=$0 ;; michael@0: *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR michael@0: for as_dir in $PATH michael@0: do michael@0: IFS=$as_save_IFS michael@0: test -z "$as_dir" && as_dir=. michael@0: test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break michael@0: @@ -6472,29 +6503,29 @@ michael@0: export LC_ALL michael@0: LANGUAGE=C michael@0: export LANGUAGE michael@0: michael@0: # CDPATH. michael@0: (unset CDPATH) >/dev/null 2>&1 && unset CDPATH michael@0: michael@0: michael@0: -# as_fn_error ERROR [LINENO LOG_FD] michael@0: -# --------------------------------- michael@0: +# as_fn_error STATUS ERROR [LINENO LOG_FD] michael@0: +# ---------------------------------------- michael@0: # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are michael@0: # provided, also output the error to LOG_FD, referencing LINENO. Then exit the michael@0: -# script with status $?, using 1 if that was 0. michael@0: +# script with STATUS, using 1 if that was 0. michael@0: as_fn_error () michael@0: { michael@0: - as_status=$?; test $as_status -eq 0 && as_status=1 michael@0: - if test "$3"; then michael@0: - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 michael@0: + as_status=$1; test $as_status -eq 0 && as_status=1 michael@0: + if test "$4"; then michael@0: + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack michael@0: + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 michael@0: fi michael@0: - $as_echo "$as_me: error: $1" >&2 michael@0: + $as_echo "$as_me: error: $2" >&2 michael@0: as_fn_exit $as_status michael@0: } # as_fn_error michael@0: michael@0: michael@0: # as_fn_set_status STATUS michael@0: # ----------------------- michael@0: # Set $? to STATUS, without forking. michael@0: as_fn_set_status () michael@0: @@ -6680,17 +6711,17 @@ michael@0: /^X\(\/\).*/{ michael@0: s//\1/ michael@0: q michael@0: } michael@0: s/.*/./; q'` michael@0: test -d "$as_dir" && break michael@0: done michael@0: test -z "$as_dirs" || eval "mkdir $as_dirs" michael@0: - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" michael@0: + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" michael@0: michael@0: michael@0: } # as_fn_mkdir_p michael@0: if mkdir -p . 2>/dev/null; then michael@0: as_mkdir_p='mkdir -p "$as_dir"' michael@0: else michael@0: test -d ./-p && rmdir ./-p michael@0: as_mkdir_p=false michael@0: @@ -6734,17 +6765,17 @@ michael@0: test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 michael@0: michael@0: cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 michael@0: # Save the log message, to keep $0 and so on meaningful, and to michael@0: # report actual input values of CONFIG_FILES etc. instead of their michael@0: # values after options handling. michael@0: ac_log=" michael@0: This file was extended by breakpad $as_me 0.1, which was michael@0: -generated by GNU Autoconf 2.65. Invocation command line was michael@0: +generated by GNU Autoconf 2.68. Invocation command line was michael@0: michael@0: CONFIG_FILES = $CONFIG_FILES michael@0: CONFIG_HEADERS = $CONFIG_HEADERS michael@0: CONFIG_LINKS = $CONFIG_LINKS michael@0: CONFIG_COMMANDS = $CONFIG_COMMANDS michael@0: $ $0 $@ michael@0: michael@0: on `(hostname || uname -n) 2>/dev/null | sed 1q` michael@0: @@ -6800,20 +6831,20 @@ michael@0: michael@0: Report bugs to ." michael@0: michael@0: _ACEOF michael@0: cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 michael@0: ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" michael@0: ac_cs_version="\\ michael@0: breakpad config.status 0.1 michael@0: -configured by $0, generated by GNU Autoconf 2.65, michael@0: +configured by $0, generated by GNU Autoconf 2.68, michael@0: with options \\"\$ac_cs_config\\" michael@0: michael@0: -Copyright (C) 2009 Free Software Foundation, Inc. michael@0: +Copyright (C) 2010 Free Software Foundation, Inc. michael@0: This config.status script is free software; the Free Software Foundation michael@0: gives unlimited permission to copy, distribute and modify it." michael@0: michael@0: ac_pwd='$ac_pwd' michael@0: srcdir='$srcdir' michael@0: INSTALL='$INSTALL' michael@0: MKDIR_P='$MKDIR_P' michael@0: AWK='$AWK' michael@0: @@ -6821,21 +6852,26 @@ michael@0: _ACEOF michael@0: michael@0: cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 michael@0: # The default lists apply if the user does not specify any file. michael@0: ac_need_defaults=: michael@0: while test $# != 0 michael@0: do michael@0: case $1 in michael@0: - --*=*) michael@0: + --*=?*) michael@0: ac_option=`expr "X$1" : 'X\([^=]*\)='` michael@0: ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` michael@0: ac_shift=: michael@0: ;; michael@0: + --*=) michael@0: + ac_option=`expr "X$1" : 'X\([^=]*\)='` michael@0: + ac_optarg= michael@0: + ac_shift=: michael@0: + ;; michael@0: *) michael@0: ac_option=$1 michael@0: ac_optarg=$2 michael@0: ac_shift=shift michael@0: ;; michael@0: esac michael@0: michael@0: case $ac_option in michael@0: @@ -6847,38 +6883,39 @@ michael@0: --config | --confi | --conf | --con | --co | --c ) michael@0: $as_echo "$ac_cs_config"; exit ;; michael@0: --debug | --debu | --deb | --de | --d | -d ) michael@0: debug=: ;; michael@0: --file | --fil | --fi | --f ) michael@0: $ac_shift michael@0: case $ac_optarg in michael@0: *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; michael@0: + '') as_fn_error $? "missing file argument" ;; michael@0: esac michael@0: as_fn_append CONFIG_FILES " '$ac_optarg'" michael@0: ac_need_defaults=false;; michael@0: --header | --heade | --head | --hea ) michael@0: $ac_shift michael@0: case $ac_optarg in michael@0: *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; michael@0: esac michael@0: as_fn_append CONFIG_HEADERS " '$ac_optarg'" michael@0: ac_need_defaults=false;; michael@0: --he | --h) michael@0: # Conflict between --help and --header michael@0: - as_fn_error "ambiguous option: \`$1' michael@0: + as_fn_error $? "ambiguous option: \`$1' michael@0: Try \`$0 --help' for more information.";; michael@0: --help | --hel | -h ) michael@0: $as_echo "$ac_cs_usage"; exit ;; michael@0: -q | -quiet | --quiet | --quie | --qui | --qu | --q \ michael@0: | -silent | --silent | --silen | --sile | --sil | --si | --s) michael@0: ac_cs_silent=: ;; michael@0: michael@0: # This is an error. michael@0: - -*) as_fn_error "unrecognized option: \`$1' michael@0: + -*) as_fn_error $? "unrecognized option: \`$1' michael@0: Try \`$0 --help' for more information." ;; michael@0: michael@0: *) as_fn_append ac_config_targets " $1" michael@0: ac_need_defaults=false ;; michael@0: michael@0: esac michael@0: shift michael@0: done michael@0: @@ -6926,17 +6963,17 @@ michael@0: # Handling of arguments. michael@0: for ac_config_target in $ac_config_targets michael@0: do michael@0: case $ac_config_target in michael@0: "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; michael@0: "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; michael@0: "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; michael@0: michael@0: - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; michael@0: + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; michael@0: esac michael@0: done michael@0: michael@0: michael@0: # If the user did not use the arguments to specify the items to instantiate, michael@0: # then the envvar interface is used. Set only those that are not. michael@0: # We use the long form for the default assignment because of an extremely michael@0: # bizarre bug on SunOS 4.1.3. michael@0: @@ -6949,82 +6986,84 @@ michael@0: # Have a temporary directory for convenience. Make it in the build tree michael@0: # simply because there is no reason against having it here, and in addition, michael@0: # creating and moving files from /tmp can sometimes cause problems. michael@0: # Hook for its removal unless debugging. michael@0: # Note that there is a small window in which the directory will not be cleaned: michael@0: # after its creation but before its name has been assigned to `$tmp'. michael@0: $debug || michael@0: { michael@0: - tmp= michael@0: + tmp= ac_tmp= michael@0: trap 'exit_status=$? michael@0: - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status michael@0: + : "${ac_tmp:=$tmp}" michael@0: + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status michael@0: ' 0 michael@0: trap 'as_fn_exit 1' 1 2 13 15 michael@0: } michael@0: # Create a (secure) tmp directory for tmp files. michael@0: michael@0: { michael@0: tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && michael@0: - test -n "$tmp" && test -d "$tmp" michael@0: + test -d "$tmp" michael@0: } || michael@0: { michael@0: tmp=./conf$$-$RANDOM michael@0: (umask 077 && mkdir "$tmp") michael@0: -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 michael@0: +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 michael@0: +ac_tmp=$tmp michael@0: michael@0: # Set up the scripts for CONFIG_FILES section. michael@0: # No need to generate them if there are no CONFIG_FILES. michael@0: # This happens for instance with `./config.status config.h'. michael@0: if test -n "$CONFIG_FILES"; then michael@0: michael@0: michael@0: ac_cr=`echo X | tr X '\015'` michael@0: # On cygwin, bash can eat \r inside `` if the user requested igncr. michael@0: # But we know of no other shell where ac_cr would be empty at this michael@0: # point, so we can use a bashism as a fallback. michael@0: if test "x$ac_cr" = x; then michael@0: eval ac_cr=\$\'\\r\' michael@0: fi michael@0: ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` michael@0: if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then michael@0: - ac_cs_awk_cr='\r' michael@0: + ac_cs_awk_cr='\\r' michael@0: else michael@0: ac_cs_awk_cr=$ac_cr michael@0: fi michael@0: michael@0: -echo 'BEGIN {' >"$tmp/subs1.awk" && michael@0: +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && michael@0: _ACEOF michael@0: michael@0: michael@0: { michael@0: echo "cat >conf$$subs.awk <<_ACEOF" && michael@0: echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && michael@0: echo "_ACEOF" michael@0: } >conf$$subs.sh || michael@0: - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` michael@0: + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` michael@0: ac_delim='%!_!# ' michael@0: for ac_last_try in false false false false false :; do michael@0: . ./conf$$subs.sh || michael@0: - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: michael@0: ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` michael@0: if test $ac_delim_n = $ac_delim_num; then michael@0: break michael@0: elif $ac_last_try; then michael@0: - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 michael@0: else michael@0: ac_delim="$ac_delim!$ac_delim _$ac_delim!! " michael@0: fi michael@0: done michael@0: rm -f conf$$subs.sh michael@0: michael@0: cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 michael@0: -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && michael@0: +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && michael@0: _ACEOF michael@0: sed -n ' michael@0: h michael@0: s/^/S["/; s/!.*/"]=/ michael@0: p michael@0: g michael@0: s/^[^!]*!// michael@0: :repl michael@0: @@ -7062,17 +7101,17 @@ michael@0: /^[^""]/{ michael@0: N michael@0: s/\n// michael@0: } michael@0: ' >>$CONFIG_STATUS || ac_write_fail=1 michael@0: rm -f conf$$subs.awk michael@0: cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 michael@0: _ACAWK michael@0: -cat >>"\$tmp/subs1.awk" <<_ACAWK && michael@0: +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && michael@0: for (key in S) S_is_set[key] = 1 michael@0: FS = "" michael@0: michael@0: } michael@0: { michael@0: line = $ 0 michael@0: nfields = split(line, field, "@") michael@0: substed = 0 michael@0: @@ -7094,59 +7133,67 @@ michael@0: michael@0: _ACAWK michael@0: _ACEOF michael@0: cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 michael@0: if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then michael@0: sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" michael@0: else michael@0: cat michael@0: -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ michael@0: - || as_fn_error "could not setup config files machinery" "$LINENO" 5 michael@0: +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ michael@0: + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 michael@0: _ACEOF michael@0: michael@0: -# VPATH may cause trouble with some makes, so we remove $(srcdir), michael@0: -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and michael@0: +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), michael@0: +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and michael@0: # trailing colons and then remove the whole line if VPATH becomes empty michael@0: # (actually we leave an empty line to preserve line numbers). michael@0: if test "x$srcdir" = x.; then michael@0: - ac_vpsub='/^[ ]*VPATH[ ]*=/{ michael@0: -s/:*\$(srcdir):*/:/ michael@0: -s/:*\${srcdir}:*/:/ michael@0: -s/:*@srcdir@:*/:/ michael@0: -s/^\([^=]*=[ ]*\):*/\1/ michael@0: + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ michael@0: +h michael@0: +s/// michael@0: +s/^/:/ michael@0: +s/[ ]*$/:/ michael@0: +s/:\$(srcdir):/:/g michael@0: +s/:\${srcdir}:/:/g michael@0: +s/:@srcdir@:/:/g michael@0: +s/^:*// michael@0: s/:*$// michael@0: +x michael@0: +s/\(=[ ]*\).*/\1/ michael@0: +G michael@0: +s/\n// michael@0: s/^[^=]*=[ ]*$// michael@0: }' michael@0: fi michael@0: michael@0: cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 michael@0: fi # test -n "$CONFIG_FILES" michael@0: michael@0: # Set up the scripts for CONFIG_HEADERS section. michael@0: # No need to generate them if there are no CONFIG_HEADERS. michael@0: # This happens for instance with `./config.status Makefile'. michael@0: if test -n "$CONFIG_HEADERS"; then michael@0: -cat >"$tmp/defines.awk" <<\_ACAWK || michael@0: +cat >"$ac_tmp/defines.awk" <<\_ACAWK || michael@0: BEGIN { michael@0: _ACEOF michael@0: michael@0: # Transform confdefs.h into an awk script `defines.awk', embedded as michael@0: # here-document in config.status, that substitutes the proper values into michael@0: # config.h.in to produce config.h. michael@0: michael@0: # Create a delimiter string that does not exist in confdefs.h, to ease michael@0: # handling of long lines. michael@0: ac_delim='%!_!# ' michael@0: for ac_last_try in false false :; do michael@0: - ac_t=`sed -n "/$ac_delim/p" confdefs.h` michael@0: - if test -z "$ac_t"; then michael@0: + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` michael@0: + if test -z "$ac_tt"; then michael@0: break michael@0: elif $ac_last_try; then michael@0: - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 michael@0: + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 michael@0: else michael@0: ac_delim="$ac_delim!$ac_delim _$ac_delim!! " michael@0: fi michael@0: done michael@0: michael@0: # For the awk script, D is an array of macro values keyed by name, michael@0: # likewise P contains macro parameters if any. Preserve backslash michael@0: # newline sequences. michael@0: @@ -7221,30 +7268,30 @@ michael@0: next michael@0: } michael@0: } michael@0: } michael@0: { print } michael@0: _ACAWK michael@0: _ACEOF michael@0: cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 michael@0: - as_fn_error "could not setup config headers machinery" "$LINENO" 5 michael@0: + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 michael@0: fi # test -n "$CONFIG_HEADERS" michael@0: michael@0: michael@0: eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" michael@0: shift michael@0: for ac_tag michael@0: do michael@0: case $ac_tag in michael@0: :[FHLC]) ac_mode=$ac_tag; continue;; michael@0: esac michael@0: case $ac_mode$ac_tag in michael@0: :[FHL]*:*);; michael@0: - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; michael@0: + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; michael@0: :[FH]-) ac_tag=-:-;; michael@0: :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; michael@0: esac michael@0: ac_save_IFS=$IFS michael@0: IFS=: michael@0: set x $ac_tag michael@0: IFS=$ac_save_IFS michael@0: shift michael@0: @@ -7253,26 +7300,26 @@ michael@0: michael@0: case $ac_mode in michael@0: :L) ac_source=$1;; michael@0: :[FH]) michael@0: ac_file_inputs= michael@0: for ac_f michael@0: do michael@0: case $ac_f in michael@0: - -) ac_f="$tmp/stdin";; michael@0: + -) ac_f="$ac_tmp/stdin";; michael@0: *) # Look for the file first in the build tree, then in the source tree michael@0: # (if the path is not absolute). The absolute path cannot be DOS-style, michael@0: # because $ac_f cannot contain `:'. michael@0: test -f "$ac_f" || michael@0: case $ac_f in michael@0: [\\/$]*) false;; michael@0: *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; michael@0: esac || michael@0: - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; michael@0: + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; michael@0: esac michael@0: case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac michael@0: as_fn_append ac_file_inputs " '$ac_f'" michael@0: done michael@0: michael@0: # Let's still pretend it is `configure' which instantiates (i.e., don't michael@0: # use $as_me), people would be surprised to read: michael@0: # /* config.h. Generated by config.status. */ michael@0: @@ -7288,18 +7335,18 @@ michael@0: case $configure_input in #( michael@0: *\&* | *\|* | *\\* ) michael@0: ac_sed_conf_input=`$as_echo "$configure_input" | michael@0: sed 's/[\\\\&|]/\\\\&/g'`;; #( michael@0: *) ac_sed_conf_input=$configure_input;; michael@0: esac michael@0: michael@0: case $ac_tag in michael@0: - *:-:* | *:-) cat >"$tmp/stdin" \ michael@0: - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; michael@0: + *:-:* | *:-) cat >"$ac_tmp/stdin" \ michael@0: + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; michael@0: esac michael@0: ;; michael@0: esac michael@0: michael@0: ac_dir=`$as_dirname -- "$ac_file" || michael@0: $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ michael@0: X"$ac_file" : 'X\(//\)[^/]' \| \ michael@0: X"$ac_file" : 'X\(//\)$' \| \ michael@0: @@ -7425,56 +7472,57 @@ michael@0: s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t michael@0: s&@builddir@&$ac_builddir&;t t michael@0: s&@abs_builddir@&$ac_abs_builddir&;t t michael@0: s&@abs_top_builddir@&$ac_abs_top_builddir&;t t michael@0: s&@INSTALL@&$ac_INSTALL&;t t michael@0: s&@MKDIR_P@&$ac_MKDIR_P&;t t michael@0: $ac_datarootdir_hack michael@0: " michael@0: -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ michael@0: - || as_fn_error "could not create $ac_file" "$LINENO" 5 michael@0: +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ michael@0: + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 michael@0: michael@0: test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && michael@0: - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && michael@0: - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && michael@0: + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && michael@0: + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ michael@0: + "$ac_tmp/out"`; test -z "$ac_out"; } && michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' michael@0: -which seems to be undefined. Please make sure it is defined." >&5 michael@0: +which seems to be undefined. Please make sure it is defined" >&5 michael@0: $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' michael@0: -which seems to be undefined. Please make sure it is defined." >&2;} michael@0: - michael@0: - rm -f "$tmp/stdin" michael@0: +which seems to be undefined. Please make sure it is defined" >&2;} michael@0: + michael@0: + rm -f "$ac_tmp/stdin" michael@0: case $ac_file in michael@0: - -) cat "$tmp/out" && rm -f "$tmp/out";; michael@0: - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; michael@0: + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; michael@0: + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; michael@0: esac \ michael@0: - || as_fn_error "could not create $ac_file" "$LINENO" 5 michael@0: + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 michael@0: ;; michael@0: :H) michael@0: # michael@0: # CONFIG_HEADER michael@0: # michael@0: if test x"$ac_file" != x-; then michael@0: { michael@0: $as_echo "/* $configure_input */" \ michael@0: - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" michael@0: - } >"$tmp/config.h" \ michael@0: - || as_fn_error "could not create $ac_file" "$LINENO" 5 michael@0: - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then michael@0: + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" michael@0: + } >"$ac_tmp/config.h" \ michael@0: + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 michael@0: + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 michael@0: $as_echo "$as_me: $ac_file is unchanged" >&6;} michael@0: else michael@0: rm -f "$ac_file" michael@0: - mv "$tmp/config.h" "$ac_file" \ michael@0: - || as_fn_error "could not create $ac_file" "$LINENO" 5 michael@0: + mv "$ac_tmp/config.h" "$ac_file" \ michael@0: + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 michael@0: fi michael@0: else michael@0: $as_echo "/* $configure_input */" \ michael@0: - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ michael@0: - || as_fn_error "could not create -" "$LINENO" 5 michael@0: + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ michael@0: + || as_fn_error $? "could not create -" "$LINENO" 5 michael@0: fi michael@0: # Compute "$ac_file"'s index in $config_headers. michael@0: _am_arg="$ac_file" michael@0: _am_stamp_count=1 michael@0: for _am_header in $config_headers :; do michael@0: case $_am_header in michael@0: $_am_arg | $_am_arg:* ) michael@0: break ;; michael@0: @@ -7614,17 +7662,17 @@ michael@0: done # for ac_tag michael@0: michael@0: michael@0: as_fn_exit 0 michael@0: _ACEOF michael@0: ac_clean_files=$ac_clean_files_save michael@0: michael@0: test $ac_write_fail = 0 || michael@0: - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 michael@0: + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 michael@0: michael@0: michael@0: # configure is writing to config.log, and then calls config.status. michael@0: # config.status does its own redirection, appending to config.log. michael@0: # Unfortunately, on DOS this fails, as config.log is still kept open michael@0: # by configure, so config.status won't be able to write to it; its michael@0: # output is simply discarded. So we exec the FD to /dev/null, michael@0: # effectively closing config.log, so it can be properly (re)opened and michael@0: @@ -7635,15 +7683,15 @@ michael@0: ac_config_status_args= michael@0: test "$silent" = yes && michael@0: ac_config_status_args="$ac_config_status_args --quiet" michael@0: exec 5>/dev/null michael@0: $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false michael@0: exec 5>>config.log michael@0: # Use ||, not &&, to avoid exiting from the if with $? = 1, which michael@0: # would make configure fail if this is the last instruction. michael@0: - $ac_cs_success || as_fn_exit $? michael@0: + $ac_cs_success || as_fn_exit 1 michael@0: fi michael@0: if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then michael@0: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 michael@0: $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} michael@0: fi michael@0: michael@0: diff --git a/src/common/dwarf_cfi_to_module.cc b/src/common/dwarf_cfi_to_module.cc michael@0: --- a/src/common/dwarf_cfi_to_module.cc michael@0: +++ b/src/common/dwarf_cfi_to_module.cc michael@0: @@ -122,17 +122,18 @@ michael@0: return_address_ = return_address; michael@0: michael@0: // Breakpad STACK CFI records must provide a .ra rule, but DWARF CFI michael@0: // may not establish any rule for .ra if the return address column michael@0: // is an ordinary register, and that register holds the return michael@0: // address on entry to the function. So establish an initial .ra michael@0: // rule citing the return address register. michael@0: if (return_address_ < register_names_.size()) michael@0: - entry_->initial_rules[ra_name_] = register_names_[return_address_]; michael@0: + entry_->initial_rules[ra_name_] michael@0: + = Module::Expr(register_names_[return_address_], 0, false); michael@0: michael@0: return true; michael@0: } michael@0: michael@0: string DwarfCFIToModule::RegisterName(int i) { michael@0: assert(entry_); michael@0: if (i < 0) { michael@0: assert(i == kCFARegister); michael@0: @@ -148,69 +149,65 @@ michael@0: michael@0: reporter_->UnnamedRegister(entry_offset_, reg); michael@0: char buf[30]; michael@0: sprintf(buf, "unnamed_register%u", reg); michael@0: return buf; michael@0: } michael@0: michael@0: void DwarfCFIToModule::Record(Module::Address address, int reg, michael@0: - const string &rule) { michael@0: + const Module::Expr &rule) { michael@0: assert(entry_); michael@0: michael@0: - // Place the name in our global set of strings, and then use the string michael@0: - // from the set. Even though the assignment looks like a copy, all the michael@0: - // major std::string implementations use reference counting internally, michael@0: - // so the effect is to have all our data structures share copies of rules michael@0: - // whenever possible. Since register names are drawn from a michael@0: - // vector, register names are already shared. michael@0: - string shared_rule = *common_strings_.insert(rule).first; michael@0: - michael@0: // Is this one of this entry's initial rules? michael@0: if (address == entry_->address) michael@0: - entry_->initial_rules[RegisterName(reg)] = shared_rule; michael@0: + entry_->initial_rules[RegisterName(reg)] = rule; michael@0: // File it under the appropriate address. michael@0: else michael@0: - entry_->rule_changes[address][RegisterName(reg)] = shared_rule; michael@0: + entry_->rule_changes[address][RegisterName(reg)] = rule; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) { michael@0: reporter_->UndefinedNotSupported(entry_offset_, RegisterName(reg)); michael@0: // Treat this as a non-fatal error. michael@0: return true; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) { michael@0: - ostringstream s; michael@0: - s << RegisterName(reg); michael@0: - Record(address, reg, s.str()); michael@0: + // reg + 0 michael@0: + Module::Expr rule michael@0: + = Module::Expr(RegisterName(reg), 0, false); michael@0: + Record(address, reg, rule); michael@0: return true; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::OffsetRule(uint64 address, int reg, michael@0: int base_register, long offset) { michael@0: - ostringstream s; michael@0: - s << RegisterName(base_register) << " " << offset << " + ^"; michael@0: - Record(address, reg, s.str()); michael@0: + // *(base_register + offset) michael@0: + Module::Expr rule michael@0: + = Module::Expr(RegisterName(base_register), offset, true); michael@0: + Record(address, reg, rule); michael@0: return true; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg, michael@0: int base_register, long offset) { michael@0: - ostringstream s; michael@0: - s << RegisterName(base_register) << " " << offset << " +"; michael@0: - Record(address, reg, s.str()); michael@0: + // base_register + offset michael@0: + Module::Expr rule michael@0: + = Module::Expr(RegisterName(base_register), offset, false); michael@0: + Record(address, reg, rule); michael@0: return true; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::RegisterRule(uint64 address, int reg, michael@0: int base_register) { michael@0: - ostringstream s; michael@0: - s << RegisterName(base_register); michael@0: - Record(address, reg, s.str()); michael@0: + // base_register + 0 michael@0: + Module::Expr rule michael@0: + = Module::Expr(RegisterName(base_register), 0, false); michael@0: + Record(address, reg, rule); michael@0: return true; michael@0: } michael@0: michael@0: bool DwarfCFIToModule::ExpressionRule(uint64 address, int reg, michael@0: const string &expression) { michael@0: reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg)); michael@0: // Treat this as a non-fatal error. michael@0: return true; michael@0: diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h michael@0: --- a/src/common/dwarf_cfi_to_module.h michael@0: +++ b/src/common/dwarf_cfi_to_module.h michael@0: @@ -147,17 +147,17 @@ michael@0: const string &expression); michael@0: virtual bool End(); michael@0: michael@0: private: michael@0: // Return the name to use for register REG. michael@0: string RegisterName(int i); michael@0: michael@0: // Record RULE for register REG at ADDRESS. michael@0: - void Record(Module::Address address, int reg, const string &rule); michael@0: + void Record(Module::Address address, int reg, const Module::Expr &rule); michael@0: michael@0: // The module to which we should add entries. michael@0: Module *module_; michael@0: michael@0: // Map from register numbers to register names. michael@0: const vector ®ister_names_; michael@0: michael@0: // The reporter to use to report problems. michael@0: diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc michael@0: --- a/src/common/dwarf_cfi_to_module_unittest.cc michael@0: +++ b/src/common/dwarf_cfi_to_module_unittest.cc michael@0: @@ -153,69 +153,71 @@ michael@0: } michael@0: michael@0: TEST_F(Rule, SameValueRule) { michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.SameValueRule(entry_address, 6)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: Module::RuleMap expected_initial; michael@0: - expected_initial["reg6"] = "reg6"; michael@0: + expected_initial["reg6"] = Module::Expr("reg6", 0, false); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); michael@0: EXPECT_EQ(0U, entries[0]->rule_changes.size()); michael@0: } michael@0: michael@0: TEST_F(Rule, OffsetRule) { michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.OffsetRule(entry_address + 1, return_reg, michael@0: DwarfCFIToModule::kCFARegister, michael@0: 16927065)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: EXPECT_EQ(0U, entries[0]->initial_rules.size()); michael@0: Module::RuleChangeMap expected_changes; michael@0: - expected_changes[entry_address + 1][".ra"] = ".cfa 16927065 + ^"; michael@0: + expected_changes[entry_address + 1][".ra"] = michael@0: + Module::Expr(".cfa", 16927065, true); michael@0: EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); michael@0: } michael@0: michael@0: TEST_F(Rule, OffsetRuleNegative) { michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.OffsetRule(entry_address + 1, michael@0: DwarfCFIToModule::kCFARegister, 4, -34530721)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: EXPECT_EQ(0U, entries[0]->initial_rules.size()); michael@0: Module::RuleChangeMap expected_changes; michael@0: - expected_changes[entry_address + 1][".cfa"] = "reg4 -34530721 + ^"; michael@0: + expected_changes[entry_address + 1][".cfa"] = michael@0: + Module::Expr("reg4", -34530721, true); michael@0: EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); michael@0: } michael@0: michael@0: TEST_F(Rule, ValOffsetRule) { michael@0: // Use an unnamed register number, to exercise that branch of RegisterName. michael@0: EXPECT_CALL(reporter, UnnamedRegister(_, 11)); michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.ValOffsetRule(entry_address + 0x5ab7, michael@0: DwarfCFIToModule::kCFARegister, michael@0: 11, 61812979)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: EXPECT_EQ(0U, entries[0]->initial_rules.size()); michael@0: Module::RuleChangeMap expected_changes; michael@0: expected_changes[entry_address + 0x5ab7][".cfa"] = michael@0: - "unnamed_register11 61812979 +"; michael@0: + Module::Expr("unnamed_register11", 61812979, false); michael@0: EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); michael@0: } michael@0: michael@0: TEST_F(Rule, RegisterRule) { michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 3)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: Module::RuleMap expected_initial; michael@0: - expected_initial[".ra"] = "reg3"; michael@0: + expected_initial[".ra"] = Module::Expr("reg3", 0, false); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); michael@0: EXPECT_EQ(0U, entries[0]->rule_changes.size()); michael@0: } michael@0: michael@0: TEST_F(Rule, ExpressionRule) { michael@0: EXPECT_CALL(reporter, ExpressionsNotSupported(_, "reg2")); michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.ExpressionRule(entry_address + 0xf326, 2, michael@0: @@ -239,45 +241,46 @@ michael@0: michael@0: TEST_F(Rule, DefaultReturnAddressRule) { michael@0: return_reg = 2; michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.RegisterRule(entry_address, 0, 1)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: Module::RuleMap expected_initial; michael@0: - expected_initial[".ra"] = "reg2"; michael@0: - expected_initial["reg0"] = "reg1"; michael@0: + expected_initial[".ra"] = Module::Expr("reg2", 0, false); michael@0: + expected_initial["reg0"] = Module::Expr("reg1", 0, false); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); michael@0: EXPECT_EQ(0U, entries[0]->rule_changes.size()); michael@0: } michael@0: michael@0: TEST_F(Rule, DefaultReturnAddressRuleOverride) { michael@0: return_reg = 2; michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 1)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: Module::RuleMap expected_initial; michael@0: - expected_initial[".ra"] = "reg1"; michael@0: + expected_initial[".ra"] = Module::Expr("reg1", 0, false); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); michael@0: EXPECT_EQ(0U, entries[0]->rule_changes.size()); michael@0: } michael@0: michael@0: TEST_F(Rule, DefaultReturnAddressRuleLater) { michael@0: return_reg = 2; michael@0: StartEntry(); michael@0: ASSERT_TRUE(handler.RegisterRule(entry_address + 1, return_reg, 1)); michael@0: ASSERT_TRUE(handler.End()); michael@0: CheckEntry(); michael@0: Module::RuleMap expected_initial; michael@0: - expected_initial[".ra"] = "reg2"; michael@0: + expected_initial[".ra"] = Module::Expr("reg2", 0, false); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); michael@0: Module::RuleChangeMap expected_changes; michael@0: - expected_changes[entry_address + 1][".ra"] = "reg1"; michael@0: + expected_changes[entry_address + 1][".ra"] = michael@0: + Module::Expr("reg1", 0, false); michael@0: EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); michael@0: } michael@0: michael@0: TEST(RegisterNames, I386) { michael@0: vector names = DwarfCFIToModule::RegisterNames::I386(); michael@0: michael@0: EXPECT_EQ("$eax", names[0]); michael@0: EXPECT_EQ("$ecx", names[1]); michael@0: diff --git a/src/common/module.cc b/src/common/module.cc michael@0: --- a/src/common/module.cc michael@0: +++ b/src/common/module.cc michael@0: @@ -251,16 +251,34 @@ michael@0: } michael@0: michael@0: bool Module::ReportError() { michael@0: fprintf(stderr, "error writing symbol file: %s\n", michael@0: strerror(errno)); michael@0: return false; michael@0: } michael@0: michael@0: +std::ostream& operator<<(std::ostream& stream, const Module::Expr& expr) { michael@0: + assert(!expr.invalid()); michael@0: + switch (expr.how_) { michael@0: + case Module::kExprSimple: michael@0: + stream << expr.ident_ << " " << expr.offset_ << " +"; michael@0: + break; michael@0: + case Module::kExprSimpleMem: michael@0: + stream << expr.ident_ << " " << expr.offset_ << " + ^"; michael@0: + break; michael@0: + case Module::kExprPostfix: michael@0: + stream << expr.postfix_; break; michael@0: + case Module::kExprInvalid: michael@0: + default: michael@0: + break; michael@0: + } michael@0: + return stream; michael@0: +} michael@0: + michael@0: bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) { michael@0: for (RuleMap::const_iterator it = rule_map.begin(); michael@0: it != rule_map.end(); ++it) { michael@0: if (it != rule_map.begin()) michael@0: stream << ' '; michael@0: stream << it->first << ": " << it->second; michael@0: } michael@0: return stream.good(); michael@0: diff --git a/src/common/module.h b/src/common/module.h michael@0: --- a/src/common/module.h michael@0: +++ b/src/common/module.h michael@0: @@ -119,21 +119,81 @@ michael@0: }; michael@0: michael@0: // An exported symbol. michael@0: struct Extern { michael@0: Address address; michael@0: string name; michael@0: }; michael@0: michael@0: - // A map from register names to postfix expressions that recover michael@0: - // their their values. This can represent a complete set of rules to michael@0: + // Representation of an expression. This can either be a postfix michael@0: + // expression, in which case it is stored as a string, or a simple michael@0: + // expression of the form (identifier + imm) or *(identifier + imm). michael@0: + // It can also be invalid (denoting "no value"). michael@0: + enum ExprHow { michael@0: + kExprInvalid = 1, michael@0: + kExprPostfix, michael@0: + kExprSimple, michael@0: + kExprSimpleMem michael@0: + }; michael@0: + struct Expr { michael@0: + // Construct a simple-form expression michael@0: + Expr(string ident, long offset, bool deref) { michael@0: + if (ident.empty()) { michael@0: + Expr(); michael@0: + } else { michael@0: + postfix_ = ""; michael@0: + ident_ = ident; michael@0: + offset_ = offset; michael@0: + how_ = deref ? kExprSimpleMem : kExprSimple; michael@0: + } michael@0: + } michael@0: + // Construct an expression from a postfix string michael@0: + Expr(string postfix) { michael@0: + if (postfix.empty()) { michael@0: + Expr(); michael@0: + } else { michael@0: + postfix_ = postfix; michael@0: + ident_ = ""; michael@0: + offset_ = 0; michael@0: + how_ = kExprPostfix; michael@0: + } michael@0: + } michael@0: + // Construct an invalid expression michael@0: + Expr() { michael@0: + postfix_ = ""; michael@0: + ident_ = ""; michael@0: + offset_ = 0; michael@0: + how_ = kExprInvalid; michael@0: + } michael@0: + bool invalid() const { return how_ == kExprInvalid; } michael@0: + bool operator==(const Expr& other) const { michael@0: + return how_ == other.how_ && michael@0: + ident_ == other.ident_ && michael@0: + offset_ == other.offset_ && michael@0: + postfix_ == other.postfix_; michael@0: + } michael@0: + michael@0: + // The identifier that gives the starting value for simple expressions. michael@0: + string ident_; michael@0: + // The offset to add for simple expressions. michael@0: + long offset_; michael@0: + // The Postfix expression string to evaluate for non-simple expressions. michael@0: + string postfix_; michael@0: + // The operation expressed by this expression. michael@0: + ExprHow how_; michael@0: + michael@0: + friend std::ostream& operator<<(std::ostream& stream, const Expr& expr); michael@0: + }; michael@0: + michael@0: + // A map from register names to expressions that recover michael@0: + // their values. This can represent a complete set of rules to michael@0: // follow at some address, or a set of changes to be applied to an michael@0: // extant set of rules. michael@0: - typedef map RuleMap; michael@0: + typedef map RuleMap; michael@0: michael@0: // A map from addresses to RuleMaps, representing changes that take michael@0: // effect at given addresses. michael@0: typedef map RuleChangeMap; michael@0: michael@0: // A range of 'STACK CFI' stack walking information. An instance of michael@0: // this structure corresponds to a 'STACK CFI INIT' record and the michael@0: // subsequent 'STACK CFI' records that fall within its range. michael@0: diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc michael@0: --- a/src/common/module_unittest.cc michael@0: +++ b/src/common/module_unittest.cc michael@0: @@ -125,21 +125,21 @@ michael@0: function->lines.push_back(line1); michael@0: michael@0: m.AddFunction(function); michael@0: michael@0: // Some stack information. michael@0: Module::StackFrameEntry *entry = new Module::StackFrameEntry(); michael@0: entry->address = 0x30f9e5c83323973dULL; michael@0: entry->size = 0x49fc9ca7c7c13dc2ULL; michael@0: - entry->initial_rules[".cfa"] = "he was a handsome man"; michael@0: - entry->initial_rules["and"] = "what i want to know is"; michael@0: + entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man"); michael@0: + entry->initial_rules["and"] = Module::Expr("what i want to know is"); michael@0: entry->rule_changes[0x30f9e5c83323973eULL]["how"] = michael@0: - "do you like your blueeyed boy"; michael@0: - entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death"; michael@0: + Module::Expr("do you like your blueeyed boy"); michael@0: + entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death"); michael@0: m.AddStackFrameEntry(entry); michael@0: michael@0: // Set the load address. Doing this after adding all the data to michael@0: // the module must work fine. michael@0: m.SetLoadAddress(0x2ab698b0b6407073LL); michael@0: michael@0: m.Write(s, ALL_SYMBOL_DATA); michael@0: string contents = s.str(); michael@0: @@ -229,21 +229,21 @@ michael@0: function->lines.push_back(line1); michael@0: michael@0: m.AddFunction(function); michael@0: michael@0: // Some stack information. michael@0: Module::StackFrameEntry *entry = new Module::StackFrameEntry(); michael@0: entry->address = 0x30f9e5c83323973dULL; michael@0: entry->size = 0x49fc9ca7c7c13dc2ULL; michael@0: - entry->initial_rules[".cfa"] = "he was a handsome man"; michael@0: - entry->initial_rules["and"] = "what i want to know is"; michael@0: + entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man"); michael@0: + entry->initial_rules["and"] = Module::Expr("what i want to know is"); michael@0: entry->rule_changes[0x30f9e5c83323973eULL]["how"] = michael@0: - "do you like your blueeyed boy"; michael@0: - entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death"; michael@0: + Module::Expr("do you like your blueeyed boy"); michael@0: + entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death"); michael@0: m.AddStackFrameEntry(entry); michael@0: michael@0: // Set the load address. Doing this after adding all the data to michael@0: // the module must work fine. michael@0: m.SetLoadAddress(0x2ab698b0b6407073LL); michael@0: michael@0: m.Write(s, NO_CFI); michael@0: string contents = s.str(); michael@0: @@ -305,34 +305,34 @@ michael@0: entry1->address = 0xddb5f41285aa7757ULL; michael@0: entry1->size = 0x1486493370dc5073ULL; michael@0: m.AddStackFrameEntry(entry1); michael@0: michael@0: // Second STACK CFI entry, with initial rules but no deltas. michael@0: Module::StackFrameEntry *entry2 = new Module::StackFrameEntry(); michael@0: entry2->address = 0x8064f3af5e067e38ULL; michael@0: entry2->size = 0x0de2a5ee55509407ULL; michael@0: - entry2->initial_rules[".cfa"] = "I think that I shall never see"; michael@0: - entry2->initial_rules["stromboli"] = "a poem lovely as a tree"; michael@0: - entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest"; michael@0: + entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see"); michael@0: + entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree"); michael@0: + entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); michael@0: m.AddStackFrameEntry(entry2); michael@0: michael@0: // Third STACK CFI entry, with initial rules and deltas. michael@0: Module::StackFrameEntry *entry3 = new Module::StackFrameEntry(); michael@0: entry3->address = 0x5e8d0db0a7075c6cULL; michael@0: entry3->size = 0x1c7edb12a7aea229ULL; michael@0: - entry3->initial_rules[".cfa"] = "Whose woods are these"; michael@0: + entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these"); michael@0: entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] = michael@0: - "the village though"; michael@0: + Module::Expr("the village though"); michael@0: entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] = michael@0: - "he will not see me stopping here"; michael@0: + Module::Expr("he will not see me stopping here"); michael@0: entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] = michael@0: - "his house is in"; michael@0: + Module::Expr("his house is in"); michael@0: entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] = michael@0: - "I think I know"; michael@0: + Module::Expr("I think I know"); michael@0: m.AddStackFrameEntry(entry3); michael@0: michael@0: // Check that Write writes STACK CFI records properly. michael@0: m.Write(s, ALL_SYMBOL_DATA); michael@0: string contents = s.str(); michael@0: EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n" michael@0: "STACK CFI INIT 5e8d0db0a7075c6c 1c7edb12a7aea229" michael@0: " .cfa: Whose woods are these\n" michael@0: @@ -352,33 +352,33 @@ michael@0: // Check that GetStackFrameEntries works. michael@0: vector entries; michael@0: m.GetStackFrameEntries(&entries); michael@0: ASSERT_EQ(3U, entries.size()); michael@0: // Check first entry. michael@0: EXPECT_EQ(0x5e8d0db0a7075c6cULL, entries[0]->address); michael@0: EXPECT_EQ(0x1c7edb12a7aea229ULL, entries[0]->size); michael@0: Module::RuleMap entry1_initial; michael@0: - entry1_initial[".cfa"] = "Whose woods are these"; michael@0: + entry1_initial[".cfa"] = Module::Expr("Whose woods are these"); michael@0: EXPECT_THAT(entries[0]->initial_rules, ContainerEq(entry1_initial)); michael@0: Module::RuleChangeMap entry1_changes; michael@0: - entry1_changes[0x36682fad3763ffffULL][".cfa"] = "I think I know"; michael@0: - entry1_changes[0x36682fad3763ffffULL]["stromboli"] = "his house is in"; michael@0: - entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = "the village though"; michael@0: + entry1_changes[0x36682fad3763ffffULL][".cfa"] = Module::Expr("I think I know"); michael@0: + entry1_changes[0x36682fad3763ffffULL]["stromboli"] = Module::Expr("his house is in"); michael@0: + entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = Module::Expr("the village though"); michael@0: entry1_changes[0x47ceb0f63c269d7fULL]["cannoli"] = michael@0: - "he will not see me stopping here"; michael@0: + Module::Expr("he will not see me stopping here"); michael@0: EXPECT_THAT(entries[0]->rule_changes, ContainerEq(entry1_changes)); michael@0: // Check second entry. michael@0: EXPECT_EQ(0x8064f3af5e067e38ULL, entries[1]->address); michael@0: EXPECT_EQ(0x0de2a5ee55509407ULL, entries[1]->size); michael@0: ASSERT_EQ(3U, entries[1]->initial_rules.size()); michael@0: Module::RuleMap entry2_initial; michael@0: - entry2_initial[".cfa"] = "I think that I shall never see"; michael@0: - entry2_initial["stromboli"] = "a poem lovely as a tree"; michael@0: - entry2_initial["cannoli"] = "a tree whose hungry mouth is prest"; michael@0: + entry2_initial[".cfa"] = Module::Expr("I think that I shall never see"); michael@0: + entry2_initial["stromboli"] = Module::Expr("a poem lovely as a tree"); michael@0: + entry2_initial["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); michael@0: EXPECT_THAT(entries[1]->initial_rules, ContainerEq(entry2_initial)); michael@0: ASSERT_EQ(0U, entries[1]->rule_changes.size()); michael@0: // Check third entry. michael@0: EXPECT_EQ(0xddb5f41285aa7757ULL, entries[2]->address); michael@0: EXPECT_EQ(0x1486493370dc5073ULL, entries[2]->size); michael@0: ASSERT_EQ(0U, entries[2]->initial_rules.size()); michael@0: ASSERT_EQ(0U, entries[2]->rule_changes.size()); michael@0: } michael@0: @@ -585,34 +585,34 @@ michael@0: entry1->address = 0x2000; michael@0: entry1->size = 0x900; michael@0: m.AddStackFrameEntry(entry1); michael@0: michael@0: // Second STACK CFI entry, with initial rules but no deltas. michael@0: Module::StackFrameEntry *entry2 = new Module::StackFrameEntry(); michael@0: entry2->address = 0x3000; michael@0: entry2->size = 0x900; michael@0: - entry2->initial_rules[".cfa"] = "I think that I shall never see"; michael@0: - entry2->initial_rules["stromboli"] = "a poem lovely as a tree"; michael@0: - entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest"; michael@0: + entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see"); michael@0: + entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree"); michael@0: + entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); michael@0: m.AddStackFrameEntry(entry2); michael@0: michael@0: // Third STACK CFI entry, with initial rules and deltas. michael@0: Module::StackFrameEntry *entry3 = new Module::StackFrameEntry(); michael@0: entry3->address = 0x1000; michael@0: entry3->size = 0x900; michael@0: - entry3->initial_rules[".cfa"] = "Whose woods are these"; michael@0: + entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these"); michael@0: entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] = michael@0: - "the village though"; michael@0: + Module::Expr("the village though"); michael@0: entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] = michael@0: - "he will not see me stopping here"; michael@0: + Module::Expr("he will not see me stopping here"); michael@0: entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] = michael@0: - "his house is in"; michael@0: + Module::Expr("his house is in"); michael@0: entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] = michael@0: - "I think I know"; michael@0: + Module::Expr("I think I know"); michael@0: m.AddStackFrameEntry(entry3); michael@0: michael@0: Module::StackFrameEntry* s = m.FindStackFrameEntryByAddress(0x1000); michael@0: EXPECT_EQ(entry3, s); michael@0: s = m.FindStackFrameEntryByAddress(0x18FF); michael@0: EXPECT_EQ(entry3, s); michael@0: michael@0: s = m.FindStackFrameEntryByAddress(0x1900); michael@0: diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc michael@0: --- a/src/processor/cfi_frame_info.cc michael@0: +++ b/src/processor/cfi_frame_info.cc michael@0: @@ -48,17 +48,17 @@ michael@0: #endif michael@0: michael@0: template michael@0: bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap ®isters, michael@0: const MemoryRegion &memory, michael@0: RegisterValueMap *caller_registers) const { michael@0: // If there are not rules for both .ra and .cfa in effect at this address, michael@0: // don't use this CFI data for stack walking. michael@0: - if (cfa_rule_.empty() || ra_rule_.empty()) michael@0: + if (cfa_rule_.invalid() || ra_rule_.invalid()) michael@0: return false; michael@0: michael@0: RegisterValueMap working; michael@0: PostfixEvaluator evaluator(&working, &memory); michael@0: michael@0: caller_registers->clear(); michael@0: michael@0: // First, compute the CFA. michael@0: @@ -99,20 +99,20 @@ michael@0: template bool CFIFrameInfo::FindCallerRegs( michael@0: const RegisterValueMap ®isters, michael@0: const MemoryRegion &memory, michael@0: RegisterValueMap *caller_registers) const; michael@0: michael@0: string CFIFrameInfo::Serialize() const { michael@0: std::ostringstream stream; michael@0: michael@0: - if (!cfa_rule_.empty()) { michael@0: + if (!cfa_rule_.invalid()) { michael@0: stream << ".cfa: " << cfa_rule_; michael@0: } michael@0: - if (!ra_rule_.empty()) { michael@0: + if (!ra_rule_.invalid()) { michael@0: if (static_cast(stream.tellp()) != 0) michael@0: stream << " "; michael@0: stream << ".ra: " << ra_rule_; michael@0: } michael@0: for (RuleMap::const_iterator iter = register_rules_.begin(); michael@0: iter != register_rules_.end(); michael@0: ++iter) { michael@0: if (static_cast(stream.tellp()) != 0) michael@0: @@ -166,21 +166,22 @@ michael@0: if (name_.empty() || expression_.empty()) return false; michael@0: if (name_ == ".cfa") handler_->CFARule(expression_); michael@0: else if (name_ == ".ra") handler_->RARule(expression_); michael@0: else handler_->RegisterRule(name_, expression_); michael@0: return true; michael@0: } michael@0: michael@0: void CFIFrameInfoParseHandler::CFARule(const string &expression) { michael@0: - frame_info_->SetCFARule(expression); michael@0: + // 'expression' is a postfix expression string. michael@0: + frame_info_->SetCFARule(Module::Expr(expression)); michael@0: } michael@0: michael@0: void CFIFrameInfoParseHandler::RARule(const string &expression) { michael@0: - frame_info_->SetRARule(expression); michael@0: + frame_info_->SetRARule(Module::Expr(expression)); michael@0: } michael@0: michael@0: void CFIFrameInfoParseHandler::RegisterRule(const string &name, michael@0: const string &expression) { michael@0: - frame_info_->SetRegisterRule(name, expression); michael@0: + frame_info_->SetRegisterRule(name, Module::Expr(expression)); michael@0: } michael@0: michael@0: } // namespace google_breakpad michael@0: diff --git a/src/processor/cfi_frame_info.h b/src/processor/cfi_frame_info.h michael@0: --- a/src/processor/cfi_frame_info.h michael@0: +++ b/src/processor/cfi_frame_info.h michael@0: @@ -38,16 +38,17 @@ michael@0: #ifndef PROCESSOR_CFI_FRAME_INFO_H_ michael@0: #define PROCESSOR_CFI_FRAME_INFO_H_ michael@0: michael@0: #include michael@0: #include michael@0: michael@0: #include "common/using_std_string.h" michael@0: #include "google_breakpad/common/breakpad_types.h" michael@0: +#include "common/module.h" michael@0: michael@0: namespace google_breakpad { michael@0: michael@0: using std::map; michael@0: michael@0: class MemoryRegion; michael@0: michael@0: // A set of rules for recovering the calling frame's registers' michael@0: @@ -61,26 +62,27 @@ michael@0: // INIT' record that covers that instruction, and then apply the michael@0: // changes given by the 'STACK CFI' records up to our instruction's michael@0: // address. Then, use the FindCallerRegs member function to apply the michael@0: // rules to the callee frame's register values, yielding the caller michael@0: // frame's register values. michael@0: class CFIFrameInfo { michael@0: public: michael@0: // A map from register names onto values. michael@0: - template class RegisterValueMap: michael@0: + template class RegisterValueMap: michael@0: public map { }; michael@0: michael@0: // Set the expression for computing a call frame address, return michael@0: // address, or register's value. At least the CFA rule and the RA michael@0: // rule must be set before calling FindCallerRegs. michael@0: - void SetCFARule(const string &expression) { cfa_rule_ = expression; } michael@0: - void SetRARule(const string &expression) { ra_rule_ = expression; } michael@0: - void SetRegisterRule(const string ®ister_name, const string &expression) { michael@0: - register_rules_[register_name] = expression; michael@0: + void SetCFARule(const Module::Expr& rule) { cfa_rule_ = rule; } michael@0: + void SetRARule(const Module::Expr& rule) { ra_rule_ = rule; } michael@0: + void SetRegisterRule(const string& register_name, michael@0: + const Module::Expr& rule) { michael@0: + register_rules_[register_name] = rule; michael@0: } michael@0: michael@0: // Compute the values of the calling frame's registers, according to michael@0: // this rule set. Use ValueType in expression evaluation; this michael@0: // should be uint32_t on machines with 32-bit addresses, or michael@0: // uint64_t on machines with 64-bit addresses. michael@0: // michael@0: // Return true on success, false otherwise. michael@0: @@ -101,37 +103,33 @@ michael@0: RegisterValueMap *caller_registers) const; michael@0: michael@0: // Serialize the rules in this object into a string in the format michael@0: // of STACK CFI records. michael@0: string Serialize() const; michael@0: michael@0: private: michael@0: michael@0: - // A map from register names onto evaluation rules. michael@0: - typedef map RuleMap; michael@0: + // A map from register names onto evaluation rules. michael@0: + typedef map RuleMap; michael@0: michael@0: - // In this type, a "postfix expression" is an expression of the sort michael@0: - // interpreted by google_breakpad::PostfixEvaluator. michael@0: - michael@0: - // A postfix expression for computing the current frame's CFA (call michael@0: + // An expression for computing the current frame's CFA (call michael@0: // frame address). The CFA is a reference address for the frame that michael@0: // remains unchanged throughout the frame's lifetime. You should michael@0: // evaluate this expression with a dictionary initially populated michael@0: // with the values of the current frame's known registers. michael@0: - string cfa_rule_; michael@0: + Module::Expr cfa_rule_; michael@0: michael@0: // The following expressions should be evaluated with a dictionary michael@0: // initially populated with the values of the current frame's known michael@0: // registers, and with ".cfa" set to the result of evaluating the michael@0: // cfa_rule expression, above. michael@0: michael@0: - // A postfix expression for computing the current frame's return michael@0: - // address. michael@0: - string ra_rule_; michael@0: + // An expression for computing the current frame's return address. michael@0: + Module::Expr ra_rule_; michael@0: michael@0: // For a register named REG, rules[REG] is a postfix expression michael@0: // which leaves the value of REG in the calling frame on the top of michael@0: // the stack. You should evaluate this expression michael@0: RuleMap register_rules_; michael@0: }; michael@0: michael@0: // A parser for STACK CFI-style rule sets. michael@0: diff --git a/src/processor/cfi_frame_info_unittest.cc b/src/processor/cfi_frame_info_unittest.cc michael@0: --- a/src/processor/cfi_frame_info_unittest.cc michael@0: +++ b/src/processor/cfi_frame_info_unittest.cc michael@0: @@ -30,24 +30,26 @@ michael@0: // Original author: Jim Blandy michael@0: michael@0: // cfi_frame_info_unittest.cc: Unit tests for CFIFrameInfo, michael@0: // CFIRuleParser, CFIFrameInfoParseHandler, and SimpleCFIWalker. michael@0: michael@0: #include michael@0: michael@0: #include "breakpad_googletest_includes.h" michael@0: +#include "common/module.h" michael@0: #include "common/using_std_string.h" michael@0: #include "processor/cfi_frame_info.h" michael@0: #include "google_breakpad/processor/memory_region.h" michael@0: michael@0: using google_breakpad::CFIFrameInfo; michael@0: using google_breakpad::CFIFrameInfoParseHandler; michael@0: using google_breakpad::CFIRuleParser; michael@0: using google_breakpad::MemoryRegion; michael@0: +using google_breakpad::Module; michael@0: using google_breakpad::SimpleCFIWalker; michael@0: using testing::_; michael@0: using testing::A; michael@0: using testing::AtMost; michael@0: using testing::DoAll; michael@0: using testing::Return; michael@0: using testing::SetArgumentPointee; michael@0: using testing::Test; michael@0: @@ -81,56 +83,56 @@ michael@0: }; michael@0: michael@0: class Simple: public CFIFixture, public Test { }; michael@0: michael@0: // FindCallerRegs should fail if no .cfa rule is provided. michael@0: TEST_F(Simple, NoCFA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetRARule("0"); michael@0: + cfi.SetRARule(Module::Expr("0")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(".ra: 0", cfi.Serialize()); michael@0: } michael@0: michael@0: // FindCallerRegs should fail if no .ra rule is provided. michael@0: TEST_F(Simple, NoRA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("0"); michael@0: + cfi.SetCFARule(Module::Expr("0")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(".cfa: 0", cfi.Serialize()); michael@0: } michael@0: michael@0: TEST_F(Simple, SetCFAAndRARule) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("330903416631436410"); michael@0: - cfi.SetRARule("5870666104170902211"); michael@0: + cfi.SetCFARule(Module::Expr("330903416631436410")); michael@0: + cfi.SetRARule(Module::Expr("5870666104170902211")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(2U, caller_registers.size()); michael@0: ASSERT_EQ(330903416631436410ULL, caller_registers[".cfa"]); michael@0: ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]); michael@0: michael@0: ASSERT_EQ(".cfa: 330903416631436410 .ra: 5870666104170902211", michael@0: cfi.Serialize()); michael@0: } michael@0: michael@0: TEST_F(Simple, SetManyRules) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -"); michael@0: - cfi.SetRARule(".cfa 99804755 +"); michael@0: - cfi.SetRegisterRule("register1", ".cfa 54370437 *"); michael@0: - cfi.SetRegisterRule("vodkathumbscrewingly", "24076308 .cfa +"); michael@0: - cfi.SetRegisterRule("pubvexingfjordschmaltzy", ".cfa 29801007 -"); michael@0: - cfi.SetRegisterRule("uncopyrightables", "92642917 .cfa /"); michael@0: + cfi.SetCFARule(Module::Expr("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -")); michael@0: + cfi.SetRARule(Module::Expr(".cfa 99804755 +")); michael@0: + cfi.SetRegisterRule("register1", Module::Expr(".cfa 54370437 *")); michael@0: + cfi.SetRegisterRule("vodkathumbscrewingly", Module::Expr("24076308 .cfa +")); michael@0: + cfi.SetRegisterRule("pubvexingfjordschmaltzy", Module::Expr(".cfa 29801007 -")); michael@0: + cfi.SetRegisterRule("uncopyrightables", Module::Expr("92642917 .cfa /")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(6U, caller_registers.size()); michael@0: ASSERT_EQ(7664691U, caller_registers[".cfa"]); michael@0: ASSERT_EQ(107469446U, caller_registers[".ra"]); michael@0: ASSERT_EQ(416732599139967ULL, caller_registers["register1"]); michael@0: ASSERT_EQ(31740999U, caller_registers["vodkathumbscrewingly"]); michael@0: ASSERT_EQ(-22136316ULL, caller_registers["pubvexingfjordschmaltzy"]); michael@0: @@ -142,154 +144,154 @@ michael@0: "uncopyrightables: 92642917 .cfa / " michael@0: "vodkathumbscrewingly: 24076308 .cfa +", michael@0: cfi.Serialize()); michael@0: } michael@0: michael@0: TEST_F(Simple, RulesOverride) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("330903416631436410"); michael@0: - cfi.SetRARule("5870666104170902211"); michael@0: - cfi.SetCFARule("2828089117179001"); michael@0: + cfi.SetCFARule(Module::Expr("330903416631436410")); michael@0: + cfi.SetRARule(Module::Expr("5870666104170902211")); michael@0: + cfi.SetCFARule(Module::Expr("2828089117179001")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(2U, caller_registers.size()); michael@0: ASSERT_EQ(2828089117179001ULL, caller_registers[".cfa"]); michael@0: ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]); michael@0: ASSERT_EQ(".cfa: 2828089117179001 .ra: 5870666104170902211", michael@0: cfi.Serialize()); michael@0: } michael@0: michael@0: class Scope: public CFIFixture, public Test { }; michael@0: michael@0: // There should be no value for .cfa in scope when evaluating the CFA rule. michael@0: TEST_F(Scope, CFALacksCFA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule(".cfa"); michael@0: - cfi.SetRARule("0"); michael@0: + cfi.SetCFARule(Module::Expr(".cfa")); michael@0: + cfi.SetRARule(Module::Expr("0")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: } michael@0: michael@0: // There should be no value for .ra in scope when evaluating the CFA rule. michael@0: TEST_F(Scope, CFALacksRA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule(".ra"); michael@0: - cfi.SetRARule("0"); michael@0: + cfi.SetCFARule(Module::Expr(".ra")); michael@0: + cfi.SetRARule(Module::Expr("0")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: } michael@0: michael@0: // The current frame's registers should be in scope when evaluating michael@0: // the CFA rule. michael@0: TEST_F(Scope, CFASeesCurrentRegs) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: registers[".baraminology"] = 0x06a7bc63e4f13893ULL; michael@0: registers[".ornithorhynchus"] = 0x5e0bf850bafce9d2ULL; michael@0: - cfi.SetCFARule(".baraminology .ornithorhynchus +"); michael@0: - cfi.SetRARule("0"); michael@0: + cfi.SetCFARule(Module::Expr(".baraminology .ornithorhynchus +")); michael@0: + cfi.SetRARule(Module::Expr("0")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(2U, caller_registers.size()); michael@0: ASSERT_EQ(0x06a7bc63e4f13893ULL + 0x5e0bf850bafce9d2ULL, michael@0: caller_registers[".cfa"]); michael@0: } michael@0: michael@0: // .cfa should be in scope in the return address expression. michael@0: TEST_F(Scope, RASeesCFA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("48364076"); michael@0: - cfi.SetRARule(".cfa"); michael@0: + cfi.SetCFARule(Module::Expr("48364076")); michael@0: + cfi.SetRARule(Module::Expr(".cfa")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(2U, caller_registers.size()); michael@0: ASSERT_EQ(48364076U, caller_registers[".ra"]); michael@0: } michael@0: michael@0: // There should be no value for .ra in scope when evaluating the CFA rule. michael@0: TEST_F(Scope, RALacksRA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("0"); michael@0: - cfi.SetRARule(".ra"); michael@0: + cfi.SetCFARule(Module::Expr("0")); michael@0: + cfi.SetRARule(Module::Expr(".ra")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: } michael@0: michael@0: // The current frame's registers should be in scope in the return michael@0: // address expression. michael@0: TEST_F(Scope, RASeesCurrentRegs) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: registers["noachian"] = 0x54dc4a5d8e5eb503ULL; michael@0: - cfi.SetCFARule("10359370"); michael@0: - cfi.SetRARule("noachian"); michael@0: + cfi.SetCFARule(Module::Expr("10359370")); michael@0: + cfi.SetRARule(Module::Expr("noachian")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(2U, caller_registers.size()); michael@0: ASSERT_EQ(0x54dc4a5d8e5eb503ULL, caller_registers[".ra"]); michael@0: } michael@0: michael@0: // .cfa should be in scope for register rules. michael@0: TEST_F(Scope, RegistersSeeCFA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("6515179"); michael@0: - cfi.SetRARule(".cfa"); michael@0: - cfi.SetRegisterRule("rogerian", ".cfa"); michael@0: + cfi.SetCFARule(Module::Expr("6515179")); michael@0: + cfi.SetRARule(Module::Expr(".cfa")); michael@0: + cfi.SetRegisterRule("rogerian", Module::Expr(".cfa")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(3U, caller_registers.size()); michael@0: ASSERT_EQ(6515179U, caller_registers["rogerian"]); michael@0: } michael@0: michael@0: // The return address should not be in scope for register rules. michael@0: TEST_F(Scope, RegsLackRA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("42740329"); michael@0: - cfi.SetRARule("27045204"); michael@0: - cfi.SetRegisterRule("$r1", ".ra"); michael@0: + cfi.SetCFARule(Module::Expr("42740329")); michael@0: + cfi.SetRARule(Module::Expr("27045204")); michael@0: + cfi.SetRegisterRule("$r1", Module::Expr(".ra")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: } michael@0: michael@0: // Register rules can see the current frame's register values. michael@0: TEST_F(Scope, RegsSeeRegs) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: registers["$r1"] = 0x6ed3582c4bedb9adULL; michael@0: registers["$r2"] = 0xd27d9e742b8df6d0ULL; michael@0: - cfi.SetCFARule("88239303"); michael@0: - cfi.SetRARule("30503835"); michael@0: - cfi.SetRegisterRule("$r1", "$r1 42175211 = $r2"); michael@0: - cfi.SetRegisterRule("$r2", "$r2 21357221 = $r1"); michael@0: + cfi.SetCFARule(Module::Expr("88239303")); michael@0: + cfi.SetRARule(Module::Expr("30503835")); michael@0: + cfi.SetRegisterRule("$r1", Module::Expr("$r1 42175211 = $r2")); michael@0: + cfi.SetRegisterRule("$r2", Module::Expr("$r2 21357221 = $r1")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: ASSERT_EQ(4U, caller_registers.size()); michael@0: ASSERT_EQ(0xd27d9e742b8df6d0ULL, caller_registers["$r1"]); michael@0: ASSERT_EQ(0x6ed3582c4bedb9adULL, caller_registers["$r2"]); michael@0: } michael@0: michael@0: // Each rule's temporaries are separate. michael@0: TEST_F(Scope, SeparateTempsRA) { michael@0: ExpectNoMemoryReferences(); michael@0: michael@0: - cfi.SetCFARule("$temp1 76569129 = $temp1"); michael@0: - cfi.SetRARule("0"); michael@0: + cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1")); michael@0: + cfi.SetRARule(Module::Expr("0")); michael@0: ASSERT_TRUE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: michael@0: - cfi.SetCFARule("$temp1 76569129 = $temp1"); michael@0: - cfi.SetRARule("$temp1"); michael@0: + cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1")); michael@0: + cfi.SetRARule(Module::Expr("$temp1")); michael@0: ASSERT_FALSE(cfi.FindCallerRegs(registers, memory, michael@0: &caller_registers)); michael@0: } michael@0: michael@0: class MockCFIRuleParserHandler: public CFIRuleParser::Handler { michael@0: public: michael@0: MOCK_METHOD1(CFARule, void(const string &)); michael@0: MOCK_METHOD1(RARule, void(const string &)); michael@0: @@ -512,20 +514,20 @@ michael@0: .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xdc1975eba8602302ULL), michael@0: Return(true))); michael@0: // Saved return address. michael@0: EXPECT_CALL(memory, michael@0: GetMemoryAtAddress(stack_top + 16, A())) michael@0: .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL), michael@0: Return(true))); michael@0: michael@0: - call_frame_info.SetCFARule("sp 24 +"); michael@0: - call_frame_info.SetRARule(".cfa 8 - ^"); michael@0: - call_frame_info.SetRegisterRule("r0", ".cfa 24 - ^"); michael@0: - call_frame_info.SetRegisterRule("r1", "r2"); michael@0: + call_frame_info.SetCFARule(Module::Expr("sp 24 +")); michael@0: + call_frame_info.SetRARule(Module::Expr(".cfa 8 - ^")); michael@0: + call_frame_info.SetRegisterRule("r0", Module::Expr(".cfa 24 - ^")); michael@0: + call_frame_info.SetRegisterRule("r1", Module::Expr("r2")); michael@0: michael@0: callee_context.r0 = 0x94e030ca79edd119ULL; michael@0: callee_context.r1 = 0x937b4d7e95ce52d9ULL; michael@0: callee_context.r2 = 0x5fe0027416b8b62aULL; // caller's r1 michael@0: // callee_context.r3 is not valid in callee. michael@0: // callee_context.r4 is not valid in callee. michael@0: callee_context.sp = stack_top; michael@0: callee_context.pc = 0x25b21b224311d280ULL; michael@0: diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h michael@0: --- a/src/processor/postfix_evaluator-inl.h michael@0: +++ b/src/processor/postfix_evaluator-inl.h michael@0: @@ -226,52 +226,100 @@ michael@0: return false; michael@0: } michael@0: } michael@0: michael@0: return true; michael@0: } michael@0: michael@0: template michael@0: -bool PostfixEvaluator::Evaluate(const string &expression, michael@0: - DictionaryValidityType *assigned) { michael@0: +bool PostfixEvaluator::Evaluate(const Module::Expr& expr, michael@0: + DictionaryValidityType* assigned) { michael@0: + // The expression is being exevaluated only for its side effects. Skip michael@0: + // expressions that denote values only. michael@0: + if (expr.how_ != Module::kExprPostfix) { michael@0: + BPLOG(ERROR) << "Can't evaluate for side-effects: " << expr; michael@0: + return false; michael@0: + } michael@0: + michael@0: // Ensure that the stack is cleared before returning. michael@0: AutoStackClearer clearer(&stack_); michael@0: michael@0: - if (!EvaluateInternal(expression, assigned)) michael@0: + if (!EvaluateInternal(expr.postfix_, assigned)) michael@0: return false; michael@0: michael@0: // If there's anything left on the stack, it indicates incomplete execution. michael@0: // This is a failure case. If the stack is empty, evalution was complete michael@0: // and successful. michael@0: if (stack_.empty()) michael@0: return true; michael@0: michael@0: - BPLOG(ERROR) << "Incomplete execution: " << expression; michael@0: + BPLOG(ERROR) << "Incomplete execution: " << expr; michael@0: return false; michael@0: } michael@0: michael@0: template michael@0: -bool PostfixEvaluator::EvaluateForValue(const string &expression, michael@0: - ValueType *result) { michael@0: - // Ensure that the stack is cleared before returning. michael@0: - AutoStackClearer clearer(&stack_); michael@0: +bool PostfixEvaluator::EvaluateForValue(const Module::Expr& expr, michael@0: + ValueType* result) { michael@0: + switch (expr.how_) { michael@0: michael@0: - if (!EvaluateInternal(expression, NULL)) michael@0: - return false; michael@0: + // Postfix expression. Give to the evaluator and return the michael@0: + // one-and-only stack element that should be left over. michael@0: + case Module::kExprPostfix: { michael@0: + // Ensure that the stack is cleared before returning. michael@0: + AutoStackClearer clearer(&stack_); michael@0: michael@0: - // A successful execution should leave exactly one value on the stack. michael@0: - if (stack_.size() != 1) { michael@0: - BPLOG(ERROR) << "Expression yielded bad number of results: " michael@0: - << "'" << expression << "'"; michael@0: - return false; michael@0: + if (!EvaluateInternal(expr.postfix_, NULL)) michael@0: + return false; michael@0: + michael@0: + // A successful execution should leave exactly one value on the stack. michael@0: + if (stack_.size() != 1) { michael@0: + BPLOG(ERROR) << "Expression yielded bad number of results: " michael@0: + << "'" << expr << "'"; michael@0: + return false; michael@0: + } michael@0: + michael@0: + return PopValue(result); michael@0: + } michael@0: + michael@0: + // Simple-form expressions michael@0: + case Module::kExprSimple: michael@0: + case Module::kExprSimpleMem: { michael@0: + // Look up the base value michael@0: + typename DictionaryType::const_iterator iterator michael@0: + = dictionary_->find(expr.ident_); michael@0: + if (iterator == dictionary_->end()) { michael@0: + // The identifier wasn't found in the dictionary. Don't imply any michael@0: + // default value, just fail. michael@0: + BPLOG(INFO) << "Identifier " << expr.ident_ michael@0: + << " not in dictionary (kExprSimple{Mem})"; michael@0: + return false; michael@0: + } michael@0: + michael@0: + // Form the sum michael@0: + ValueType sum = iterator->second + (int64_t)expr.offset_; michael@0: + michael@0: + // and dereference if necessary michael@0: + if (expr.how_ == Module::kExprSimpleMem) { michael@0: + ValueType derefd; michael@0: + if (!memory_ || !memory_->GetMemoryAtAddress(sum, &derefd)) { michael@0: + return false; michael@0: + } michael@0: + *result = derefd; michael@0: + } else { michael@0: + *result = sum; michael@0: + } michael@0: + return true; michael@0: + } michael@0: + michael@0: + default: michael@0: + return false; michael@0: } michael@0: +} michael@0: michael@0: - return PopValue(result); michael@0: -} michael@0: michael@0: template michael@0: typename PostfixEvaluator::PopResult michael@0: PostfixEvaluator::PopValueOrIdentifier( michael@0: ValueType *value, string *identifier) { michael@0: // There needs to be at least one element on the stack to pop. michael@0: if (!stack_.size()) michael@0: return POP_RESULT_FAIL; michael@0: diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h michael@0: --- a/src/processor/postfix_evaluator.h michael@0: +++ b/src/processor/postfix_evaluator.h michael@0: @@ -70,16 +70,17 @@ michael@0: #define PROCESSOR_POSTFIX_EVALUATOR_H__ michael@0: michael@0: michael@0: #include michael@0: #include michael@0: #include michael@0: michael@0: #include "common/using_std_string.h" michael@0: +#include "common/module.h" michael@0: michael@0: namespace google_breakpad { michael@0: michael@0: using std::map; michael@0: using std::vector; michael@0: michael@0: class MemoryRegion; michael@0: michael@0: @@ -100,23 +101,23 @@ michael@0: michael@0: // Evaluate the expression, starting with an empty stack. The results of michael@0: // execution will be stored in one (or more) variables in the dictionary. michael@0: // Returns false if any failures occur during execution, leaving michael@0: // variables in the dictionary in an indeterminate state. If assigned is michael@0: // non-NULL, any keys set in the dictionary as a result of evaluation michael@0: // will also be set to true in assigned, providing a way to determine if michael@0: // an expression modifies any of its input variables. michael@0: - bool Evaluate(const string &expression, DictionaryValidityType *assigned); michael@0: + bool Evaluate(const Module::Expr &expr, DictionaryValidityType *assigned); michael@0: michael@0: - // Like Evaluate, but provides the value left on the stack to the michael@0: - // caller. If evaluation succeeds and leaves exactly one value on michael@0: - // the stack, pop that value, store it in *result, and return true. michael@0: - // Otherwise, return false. michael@0: - bool EvaluateForValue(const string &expression, ValueType *result); michael@0: + // Like Evaluate, but expects the expression to denote a value. michael@0: + // If evaluation succeeds and (in the case of a postfix expression) michael@0: + // leaves exactly one value on the stack, pop that value, store it in michael@0: + // *result, and return true. Otherwise, return false. michael@0: + bool EvaluateForValue(const Module::Expr& expression, ValueType* result); michael@0: michael@0: DictionaryType* dictionary() const { return dictionary_; } michael@0: michael@0: // Reset the dictionary. PostfixEvaluator does not take ownership. michael@0: void set_dictionary(DictionaryType *dictionary) {dictionary_ = dictionary; } michael@0: michael@0: private: michael@0: // Return values for PopValueOrIdentifier