mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
7245a7cdb5
also contains fixup for stdint changes in Breakpad. r=glandium
3745 lines
160 KiB
Diff
3745 lines
160 KiB
Diff
# HG changeset patch
|
||
# User Ted Mielczarek <ted.mielczarek@gmail.com>
|
||
# Date 1360255133 18000
|
||
# Node ID dc6d795f6d0b9357f39ac2a291be4e1c533d3c09
|
||
# Parent e57a7855d118e645730887e2b921dc83f89a25e7
|
||
Change the representation of CFI rules to avoid postfix expressions in most cases
|
||
Patch by Julian Seward <jseward@acm.org>
|
||
R=ted
|
||
|
||
diff --git a/Makefile.am b/Makefile.am
|
||
--- a/Makefile.am
|
||
+++ b/Makefile.am
|
||
@@ -138,6 +138,7 @@
|
||
src/google_breakpad/processor/stackwalker.h \
|
||
src/google_breakpad/processor/symbol_supplier.h \
|
||
src/google_breakpad/processor/system_info.h \
|
||
+ src/common/module.cc \
|
||
src/processor/address_map-inl.h \
|
||
src/processor/address_map.h \
|
||
src/processor/basic_code_module.h \
|
||
@@ -560,6 +561,7 @@
|
||
-I$(top_srcdir)/src/testing/gtest \
|
||
-I$(top_srcdir)/src/testing
|
||
src_processor_basic_source_line_resolver_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/basic_source_line_resolver.o \
|
||
src/processor/cfi_frame_info.o \
|
||
src/processor/pathname_stripper.o \
|
||
@@ -574,6 +576,7 @@
|
||
src/testing/gtest/src/gtest_main.cc \
|
||
src/testing/src/gmock-all.cc
|
||
src_processor_cfi_frame_info_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/cfi_frame_info.o \
|
||
src/processor/logging.o \
|
||
src/processor/pathname_stripper.o \
|
||
@@ -603,6 +606,7 @@
|
||
-I$(top_srcdir)/src/testing/gtest \
|
||
-I$(top_srcdir)/src/testing
|
||
src_processor_exploitability_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/minidump_processor.o \
|
||
src/processor/process_state.o \
|
||
src/processor/disassembler_x86.o \
|
||
@@ -654,6 +658,7 @@
|
||
-I$(top_srcdir)/src/testing/gtest \
|
||
-I$(top_srcdir)/src/testing
|
||
src_processor_fast_source_line_resolver_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/fast_source_line_resolver.o \
|
||
src/processor/basic_source_line_resolver.o \
|
||
src/processor/cfi_frame_info.o \
|
||
@@ -691,6 +696,7 @@
|
||
-I$(top_srcdir)/src/testing/gtest \
|
||
-I$(top_srcdir)/src/testing
|
||
src_processor_minidump_processor_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/basic_code_modules.o \
|
||
src/processor/basic_source_line_resolver.o \
|
||
src/processor/call_stack.o \
|
||
@@ -804,6 +810,7 @@
|
||
src_processor_postfix_evaluator_unittest_SOURCES = \
|
||
src/processor/postfix_evaluator_unittest.cc
|
||
src_processor_postfix_evaluator_unittest_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/logging.o \
|
||
src/processor/pathname_stripper.o \
|
||
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||
@@ -933,6 +940,7 @@
|
||
src_processor_minidump_stackwalk_SOURCES = \
|
||
src/processor/minidump_stackwalk.cc
|
||
src_processor_minidump_stackwalk_LDADD = \
|
||
+ src/common/module.o \
|
||
src/processor/basic_code_modules.o \
|
||
src/processor/basic_source_line_resolver.o \
|
||
src/processor/binarystream.o \
|
||
diff --git a/Makefile.in b/Makefile.in
|
||
--- a/Makefile.in
|
||
+++ b/Makefile.in
|
||
@@ -1,9 +1,9 @@
|
||
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
|
||
# @configure_input@
|
||
|
||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||
-# Inc.
|
||
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||
+# Foundation, Inc.
|
||
# This Makefile.in is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
@@ -195,6 +195,12 @@
|
||
am__base_list = \
|
||
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
||
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||
+am__uninstall_files_from_dir = { \
|
||
+ test -z "$$files" \
|
||
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
||
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||
+ $(am__cd) "$$dir" && rm -f $$files; }; \
|
||
+ }
|
||
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
|
||
"$(DESTDIR)$(docdir)"
|
||
LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES)
|
||
@@ -266,8 +272,8 @@
|
||
src/google_breakpad/processor/stackwalker.h \
|
||
src/google_breakpad/processor/symbol_supplier.h \
|
||
src/google_breakpad/processor/system_info.h \
|
||
- src/processor/address_map-inl.h src/processor/address_map.h \
|
||
- src/processor/basic_code_module.h \
|
||
+ src/common/module.cc src/processor/address_map-inl.h \
|
||
+ src/processor/address_map.h src/processor/basic_code_module.h \
|
||
src/processor/basic_code_modules.cc \
|
||
src/processor/basic_code_modules.h \
|
||
src/processor/basic_source_line_resolver_types.h \
|
||
@@ -327,7 +333,9 @@
|
||
src/processor/static_range_map-inl.h \
|
||
src/processor/static_range_map.h src/processor/tokenize.cc \
|
||
src/processor/tokenize.h
|
||
-@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \
|
||
+@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.$(OBJEXT) \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.$(OBJEXT) \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.$(OBJEXT) \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.$(OBJEXT) \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.$(OBJEXT) \
|
||
@@ -625,7 +633,9 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
|
||
@DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT)
|
||
src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_basic_source_line_resolver_unittest_OBJECTS)
|
||
-@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = src/processor/basic_source_line_resolver.o \
|
||
+@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \
|
||
@@ -658,6 +668,7 @@
|
||
src_processor_cfi_frame_info_unittest_OBJECTS = \
|
||
$(am_src_processor_cfi_frame_info_unittest_OBJECTS)
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@@ -699,6 +710,7 @@
|
||
src_processor_exploitability_unittest_OBJECTS = \
|
||
$(am_src_processor_exploitability_unittest_OBJECTS)
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \
|
||
@@ -731,7 +743,9 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
|
||
@DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT)
|
||
src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS)
|
||
-@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = src/processor/fast_source_line_resolver.o \
|
||
+@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/module_comparer.o \
|
||
@@ -776,6 +790,7 @@
|
||
src_processor_minidump_processor_unittest_OBJECTS = \
|
||
$(am_src_processor_minidump_processor_unittest_OBJECTS)
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \
|
||
@@ -806,6 +821,7 @@
|
||
src_processor_minidump_stackwalk_OBJECTS = \
|
||
$(am_src_processor_minidump_stackwalk_OBJECTS)
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \
|
||
@@ -867,6 +883,7 @@
|
||
src_processor_postfix_evaluator_unittest_OBJECTS = \
|
||
$(am_src_processor_postfix_evaluator_unittest_OBJECTS)
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \
|
||
@@ -1217,12 +1234,16 @@
|
||
distdir = $(PACKAGE)-$(VERSION)
|
||
top_distdir = $(distdir)
|
||
am__remove_distdir = \
|
||
- { test ! -d "$(distdir)" \
|
||
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||
- && rm -fr "$(distdir)"; }; }
|
||
+ if test -d "$(distdir)"; then \
|
||
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||
+ && rm -rf "$(distdir)" \
|
||
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
|
||
+ else :; fi
|
||
DIST_ARCHIVES = $(distdir).tar.gz
|
||
GZIP_ENV = --best
|
||
distuninstallcheck_listfiles = find . -type f -print
|
||
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||
distcleancheck_listfiles = find . -type f -print
|
||
ACLOCAL = @ACLOCAL@
|
||
AMTAR = @AMTAR@
|
||
@@ -1388,6 +1409,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stackwalker.h \
|
||
@DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/symbol_supplier.h \
|
||
@DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/system_info.h \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.cc \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/address_map-inl.h \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/address_map.h \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_module.h \
|
||
@@ -1720,6 +1742,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@@ -1735,6 +1758,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@@ -1768,6 +1792,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \
|
||
@@ -1823,6 +1848,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \
|
||
@@ -1864,6 +1890,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \
|
||
@@ -1989,6 +2016,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/postfix_evaluator_unittest.cc
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \
|
||
@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||
@@ -2127,6 +2155,7 @@
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_stackwalk.cc
|
||
|
||
@DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_LDADD = \
|
||
+@DISABLE_PROCESSOR_FALSE@ src/common/module.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \
|
||
@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \
|
||
@@ -2294,7 +2323,7 @@
|
||
|
||
.SUFFIXES:
|
||
.SUFFIXES: .S .c .cc .o .obj
|
||
-am--refresh:
|
||
+am--refresh: Makefile
|
||
@:
|
||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||
@for dep in $?; do \
|
||
@@ -2330,10 +2359,8 @@
|
||
$(am__aclocal_m4_deps):
|
||
|
||
src/config.h: src/stamp-h1
|
||
- @if test ! -f $@; then \
|
||
- rm -f src/stamp-h1; \
|
||
- $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \
|
||
- else :; fi
|
||
+ @if test ! -f $@; then rm -f src/stamp-h1; else :; fi
|
||
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi
|
||
|
||
src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
|
||
@rm -f src/stamp-h1
|
||
@@ -2371,9 +2398,7 @@
|
||
@$(NORMAL_UNINSTALL)
|
||
@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
|
||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||
- test -n "$$files" || exit 0; \
|
||
- echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
|
||
- cd "$(DESTDIR)$(libdir)" && rm -f $$files
|
||
+ dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
|
||
|
||
clean-libLIBRARIES:
|
||
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
|
||
@@ -2482,10 +2507,12 @@
|
||
src/client/linux/$(am__dirstamp):
|
||
@$(MKDIR_P) src/client/linux
|
||
@: > src/client/linux/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
-rm -f src/client/linux/libbreakpad_client.a
|
||
$(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)
|
||
$(RANLIB) src/client/linux/libbreakpad_client.a
|
||
+src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
+ src/common/$(DEPDIR)/$(am__dirstamp)
|
||
src/processor/$(am__dirstamp):
|
||
@$(MKDIR_P) src/processor
|
||
@: > src/processor/$(am__dirstamp)
|
||
@@ -2564,7 +2591,7 @@
|
||
src/$(am__dirstamp):
|
||
@$(MKDIR_P) src
|
||
@: > src/$(am__dirstamp)
|
||
-src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
|
||
+src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) $(EXTRA_src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
|
||
-rm -f src/libbreakpad.a
|
||
$(src_libbreakpad_a_AR) src/libbreakpad.a $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_LIBADD)
|
||
$(RANLIB) src/libbreakpad.a
|
||
@@ -2616,7 +2643,7 @@
|
||
src/third_party/libdisasm/x86_operand_list.$(OBJEXT): \
|
||
src/third_party/libdisasm/$(am__dirstamp) \
|
||
src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
-rm -f src/third_party/libdisasm/libdisasm.a
|
||
$(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)
|
||
$(RANLIB) src/third_party/libdisasm/libdisasm.a
|
||
@@ -2663,7 +2690,7 @@
|
||
|
||
clean-noinstPROGRAMS:
|
||
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
|
||
-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)
|
||
+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)
|
||
@rm -f src/client/linux/linux_client_unittest$(EXEEXT)
|
||
$(src_client_linux_linux_client_unittest_LINK) $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_LDADD) $(LIBS)
|
||
src/client/linux/handler/src_client_linux_linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT): \
|
||
@@ -2756,13 +2783,13 @@
|
||
src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT): \
|
||
src/common/android/$(am__dirstamp) \
|
||
src/common/android/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/client/linux/linux_client_unittest_shlib$(EXEEXT)
|
||
$(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)
|
||
src/client/linux/minidump_writer/src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.$(OBJEXT): \
|
||
src/client/linux/minidump_writer/$(am__dirstamp) \
|
||
src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/client/linux/linux_dumper_unittest_helper$(EXEEXT)
|
||
$(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)
|
||
src/common/src_common_dumper_unittest-byte_cursor_unittest.$(OBJEXT): \
|
||
@@ -2906,7 +2933,7 @@
|
||
src/testing/src/src_common_dumper_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/common/dumper_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_LDADD) $(LIBS)
|
||
src/common/src_common_test_assembler_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -2924,13 +2951,13 @@
|
||
src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/common/test_assembler_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_LDADD) $(LIBS)
|
||
src/processor/address_map_unittest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/address_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT): \
|
||
@@ -2942,7 +2969,7 @@
|
||
src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/basic_source_line_resolver_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_binarystream_unittest-binarystream_unittest.$(OBJEXT): \
|
||
@@ -2954,7 +2981,7 @@
|
||
src/testing/src/src_processor_binarystream_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/binarystream_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT): \
|
||
@@ -2969,13 +2996,13 @@
|
||
src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/cfi_frame_info_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_LDADD) $(LIBS)
|
||
src/processor/contained_range_map_unittest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/contained_range_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_disassembler_x86_unittest-disassembler_x86_unittest.$(OBJEXT): \
|
||
@@ -2990,7 +3017,7 @@
|
||
src/testing/src/src_processor_disassembler_x86_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/disassembler_x86_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT): \
|
||
@@ -3005,7 +3032,7 @@
|
||
src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/exploitability_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT): \
|
||
@@ -3017,7 +3044,7 @@
|
||
src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/fast_source_line_resolver_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_map_serializers_unittest-map_serializers_unittest.$(OBJEXT): \
|
||
@@ -3029,12 +3056,12 @@
|
||
src/testing/src/src_processor_map_serializers_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/map_serializers_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_LDADD) $(LIBS)
|
||
src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/minidump_dump$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS)
|
||
src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT): \
|
||
@@ -3046,13 +3073,13 @@
|
||
src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/minidump_processor_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS)
|
||
src/processor/minidump_stackwalk.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/minidump_stackwalk$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_LDADD) $(LIBS)
|
||
src/common/src_processor_minidump_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -3073,25 +3100,25 @@
|
||
src/testing/src/src_processor_minidump_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/minidump_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_LDADD) $(LIBS)
|
||
src/processor/pathname_stripper_unittest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/pathname_stripper_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_LDADD) $(LIBS)
|
||
src/processor/postfix_evaluator_unittest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/postfix_evaluator_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_LDADD) $(LIBS)
|
||
src/processor/range_map_unittest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/range_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_LDADD) $(LIBS)
|
||
src/common/src_processor_stackwalker_amd64_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -3109,7 +3136,7 @@
|
||
src/testing/src/src_processor_stackwalker_amd64_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/stackwalker_amd64_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_LDADD) $(LIBS)
|
||
src/common/src_processor_stackwalker_arm_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -3127,13 +3154,13 @@
|
||
src/testing/src/src_processor_stackwalker_arm_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/stackwalker_arm_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_LDADD) $(LIBS)
|
||
src/processor/stackwalker_selftest.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/stackwalker_selftest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_LDADD) $(LIBS)
|
||
src/common/src_processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -3151,7 +3178,7 @@
|
||
src/testing/src/src_processor_stackwalker_x86_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/stackwalker_x86_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_static_address_map_unittest-static_address_map_unittest.$(OBJEXT): \
|
||
@@ -3163,7 +3190,7 @@
|
||
src/testing/src/src_processor_static_address_map_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/static_address_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_static_contained_range_map_unittest-static_contained_range_map_unittest.$(OBJEXT): \
|
||
@@ -3175,7 +3202,7 @@
|
||
src/testing/src/src_processor_static_contained_range_map_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/static_contained_range_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_static_map_unittest-static_map_unittest.$(OBJEXT): \
|
||
@@ -3187,7 +3214,7 @@
|
||
src/testing/src/src_processor_static_map_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/static_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_LDADD) $(LIBS)
|
||
src/processor/src_processor_static_range_map_unittest-static_range_map_unittest.$(OBJEXT): \
|
||
@@ -3199,7 +3226,7 @@
|
||
src/testing/src/src_processor_static_range_map_unittest-gmock-all.$(OBJEXT): \
|
||
src/testing/src/$(am__dirstamp) \
|
||
src/testing/src/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/processor/static_range_map_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_LDADD) $(LIBS)
|
||
src/common/src_processor_synth_minidump_unittest-test_assembler.$(OBJEXT): \
|
||
@@ -3220,7 +3247,7 @@
|
||
src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT): \
|
||
src/processor/$(am__dirstamp) \
|
||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||
-src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/processor/synth_minidump_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_LDADD) $(LIBS)
|
||
src/tools/linux/core2md/$(am__dirstamp):
|
||
@@ -3238,7 +3265,7 @@
|
||
src/common/linux/elf_core_dump.$(OBJEXT): \
|
||
src/common/linux/$(am__dirstamp) \
|
||
src/common/linux/$(DEPDIR)/$(am__dirstamp)
|
||
-src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp)
|
||
+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)
|
||
@rm -f src/tools/linux/core2md/core2md$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_LDADD) $(LIBS)
|
||
src/common/dwarf_cfi_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
@@ -3249,8 +3276,6 @@
|
||
src/common/$(DEPDIR)/$(am__dirstamp)
|
||
src/common/language.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
src/common/$(DEPDIR)/$(am__dirstamp)
|
||
-src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
- src/common/$(DEPDIR)/$(am__dirstamp)
|
||
src/common/stabs_reader.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
src/common/$(DEPDIR)/$(am__dirstamp)
|
||
src/common/stabs_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
|
||
@@ -3279,7 +3304,7 @@
|
||
src/tools/linux/dump_syms/dump_syms.$(OBJEXT): \
|
||
src/tools/linux/dump_syms/$(am__dirstamp) \
|
||
src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/tools/linux/dump_syms/dump_syms$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_LDADD) $(LIBS)
|
||
src/tools/linux/md2core/$(am__dirstamp):
|
||
@@ -3291,7 +3316,7 @@
|
||
src/tools/linux/md2core/minidump-2-core.$(OBJEXT): \
|
||
src/tools/linux/md2core/$(am__dirstamp) \
|
||
src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/tools/linux/md2core/minidump-2-core$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_LDADD) $(LIBS)
|
||
src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest-all.$(OBJEXT): \
|
||
@@ -3306,7 +3331,7 @@
|
||
src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT): \
|
||
src/tools/linux/md2core/$(am__dirstamp) \
|
||
src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_LDADD) $(LIBS)
|
||
src/common/linux/http_upload.$(OBJEXT): \
|
||
@@ -3321,13 +3346,13 @@
|
||
src/tools/linux/symupload/minidump_upload.$(OBJEXT): \
|
||
src/tools/linux/symupload/$(am__dirstamp) \
|
||
src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS)
|
||
src/tools/linux/symupload/sym_upload.$(OBJEXT): \
|
||
src/tools/linux/symupload/$(am__dirstamp) \
|
||
src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
|
||
-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)
|
||
+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)
|
||
@rm -f src/tools/linux/symupload/sym_upload$(EXEEXT)
|
||
$(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS)
|
||
|
||
@@ -5864,9 +5889,7 @@
|
||
@$(NORMAL_UNINSTALL)
|
||
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
|
||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||
- test -n "$$files" || exit 0; \
|
||
- echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
|
||
- cd "$(DESTDIR)$(docdir)" && rm -f $$files
|
||
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
|
||
|
||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||
@@ -6001,14 +6024,15 @@
|
||
fi; \
|
||
dashes=`echo "$$dashes" | sed s/./=/g`; \
|
||
if test "$$failed" -eq 0; then \
|
||
- echo "$$grn$$dashes"; \
|
||
+ col="$$grn"; \
|
||
else \
|
||
- echo "$$red$$dashes"; \
|
||
+ col="$$red"; \
|
||
fi; \
|
||
- echo "$$banner"; \
|
||
- test -z "$$skipped" || echo "$$skipped"; \
|
||
- test -z "$$report" || echo "$$report"; \
|
||
- echo "$$dashes$$std"; \
|
||
+ echo "$${col}$$dashes$${std}"; \
|
||
+ echo "$${col}$$banner$${std}"; \
|
||
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
|
||
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
|
||
+ echo "$${col}$$dashes$${std}"; \
|
||
test "$$failed" -eq 0; \
|
||
else :; fi
|
||
|
||
@@ -6056,7 +6080,11 @@
|
||
$(am__remove_distdir)
|
||
|
||
dist-bzip2: distdir
|
||
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
||
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||
+ $(am__remove_distdir)
|
||
+
|
||
+dist-lzip: distdir
|
||
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||
$(am__remove_distdir)
|
||
|
||
dist-lzma: distdir
|
||
@@ -6064,7 +6092,7 @@
|
||
$(am__remove_distdir)
|
||
|
||
dist-xz: distdir
|
||
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
||
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||
$(am__remove_distdir)
|
||
|
||
dist-tarZ: distdir
|
||
@@ -6095,6 +6123,8 @@
|
||
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||
*.tar.lzma*) \
|
||
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
||
+ *.tar.lz*) \
|
||
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
|
||
*.tar.xz*) \
|
||
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||
*.tar.Z*) \
|
||
@@ -6114,6 +6144,7 @@
|
||
&& am__cwd=`pwd` \
|
||
&& $(am__cd) $(distdir)/_build \
|
||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
||
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
|
||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
|
||
@@ -6142,8 +6173,16 @@
|
||
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
||
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
||
distuninstallcheck:
|
||
- @$(am__cd) '$(distuninstallcheck_dir)' \
|
||
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
||
+ @test -n '$(distuninstallcheck_dir)' || { \
|
||
+ echo 'ERROR: trying to run $@ with an empty' \
|
||
+ '$$(distuninstallcheck_dir)' >&2; \
|
||
+ exit 1; \
|
||
+ }; \
|
||
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
|
||
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
|
||
+ exit 1; \
|
||
+ }; \
|
||
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|
||
|| { echo "ERROR: files left after uninstall:" ; \
|
||
if test -n "$(DESTDIR)"; then \
|
||
echo " (check DESTDIR support)"; \
|
||
@@ -6178,10 +6217,15 @@
|
||
|
||
installcheck: installcheck-am
|
||
install-strip:
|
||
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||
- `test -z '$(STRIP)' || \
|
||
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||
+ if test -z '$(STRIP)'; then \
|
||
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||
+ install; \
|
||
+ else \
|
||
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||
+ fi
|
||
mostlyclean-generic:
|
||
|
||
clean-generic:
|
||
@@ -6313,8 +6357,8 @@
|
||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
|
||
clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
|
||
clean-libLIBRARIES clean-noinstLIBRARIES clean-noinstPROGRAMS \
|
||
- ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
|
||
- dist-tarZ dist-xz dist-zip distcheck distclean \
|
||
+ ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \
|
||
+ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
|
||
distclean-compile distclean-generic distclean-hdr \
|
||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||
dvi-am html html-am info info-am install install-am \
|
||
diff --git a/aclocal.m4 b/aclocal.m4
|
||
--- a/aclocal.m4
|
||
+++ b/aclocal.m4
|
||
@@ -1,7 +1,8 @@
|
||
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
|
||
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
|
||
|
||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
|
||
+# Inc.
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
@@ -13,18 +14,21 @@
|
||
|
||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
|
||
-[m4_warning([this file was generated for autoconf 2.65.
|
||
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
|
||
+[m4_warning([this file was generated for autoconf 2.68.
|
||
You have another version of autoconf. It may work, but is not guaranteed to.
|
||
If you have problems, you may need to regenerate the build system entirely.
|
||
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
||
|
||
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
|
||
+# Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# AM_AUTOMAKE_VERSION(VERSION)
|
||
# ----------------------------
|
||
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
||
@@ -34,7 +38,7 @@
|
||
[am__api_version='1.11'
|
||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
||
dnl require some minimum version. Point them to the right macro.
|
||
-m4_if([$1], [1.11.1], [],
|
||
+m4_if([$1], [1.11.3], [],
|
||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
||
])
|
||
|
||
@@ -50,7 +54,7 @@
|
||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
|
||
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
|
||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||
@@ -79,12 +83,14 @@
|
||
|
||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||
|
||
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
|
||
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
||
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
|
||
@@ -166,14 +172,14 @@
|
||
Usually this means the macro was only invoked conditionally.]])
|
||
fi])])
|
||
|
||
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
|
||
-# Free Software Foundation, Inc.
|
||
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
|
||
+# 2010, 2011 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
-# serial 10
|
||
+# serial 12
|
||
|
||
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
||
# written in clear, in which case automake, when reading aclocal.m4,
|
||
@@ -213,6 +219,7 @@
|
||
# instance it was reported that on HP-UX the gcc test will end up
|
||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||
# in D'.
|
||
+ rm -rf conftest.dir
|
||
mkdir conftest.dir
|
||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||
# using a relative directory.
|
||
@@ -277,7 +284,7 @@
|
||
break
|
||
fi
|
||
;;
|
||
- msvisualcpp | msvcmsys)
|
||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||
# This compiler won't grok `-c -o', but also, the minuso test has
|
||
# not run yet. These depmodes are late enough in the game, and
|
||
# so weak that their functioning should not be impacted.
|
||
@@ -342,10 +349,13 @@
|
||
if test "x$enable_dependency_tracking" != xno; then
|
||
am_depcomp="$ac_aux_dir/depcomp"
|
||
AMDEPBACKSLASH='\'
|
||
+ am__nodep='_no'
|
||
fi
|
||
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
||
AC_SUBST([AMDEPBACKSLASH])dnl
|
||
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
|
||
+AC_SUBST([am__nodep])dnl
|
||
+_AM_SUBST_NOTMAKE([am__nodep])dnl
|
||
])
|
||
|
||
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
||
@@ -579,12 +589,15 @@
|
||
done
|
||
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
||
|
||
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
|
||
+# Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# AM_PROG_INSTALL_SH
|
||
# ------------------
|
||
# Define $install_sh.
|
||
@@ -751,12 +764,15 @@
|
||
fi
|
||
])
|
||
|
||
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
|
||
+# Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# AM_PROG_MKDIR_P
|
||
# ---------------
|
||
# Check for `mkdir -p'.
|
||
@@ -779,13 +795,14 @@
|
||
|
||
# Helper functions for option handling. -*- Autoconf -*-
|
||
|
||
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
|
||
+# Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
-# serial 4
|
||
+# serial 5
|
||
|
||
# _AM_MANGLE_OPTION(NAME)
|
||
# -----------------------
|
||
@@ -793,13 +810,13 @@
|
||
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
|
||
|
||
# _AM_SET_OPTION(NAME)
|
||
-# ------------------------------
|
||
+# --------------------
|
||
# Set option NAME. Presently that only means defining a flag for this option.
|
||
AC_DEFUN([_AM_SET_OPTION],
|
||
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
||
|
||
# _AM_SET_OPTIONS(OPTIONS)
|
||
-# ----------------------------------
|
||
+# ------------------------
|
||
# OPTIONS is a space-separated list of Automake options.
|
||
AC_DEFUN([_AM_SET_OPTIONS],
|
||
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
||
@@ -810,12 +827,14 @@
|
||
AC_DEFUN([_AM_IF_OPTION],
|
||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
||
|
||
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# AM_RUN_LOG(COMMAND)
|
||
# -------------------
|
||
# Run COMMAND, save the exit status in ac_status, and log it.
|
||
@@ -892,12 +911,14 @@
|
||
fi
|
||
AC_MSG_RESULT(yes)])
|
||
|
||
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
+# serial 1
|
||
+
|
||
# AM_PROG_INSTALL_STRIP
|
||
# ---------------------
|
||
# One issue with vendor `install' (even GNU) is that you can't
|
||
@@ -920,13 +941,13 @@
|
||
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
||
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
||
|
||
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
# with or without modifications, as long as this notice is preserved.
|
||
|
||
-# serial 2
|
||
+# serial 3
|
||
|
||
# _AM_SUBST_NOTMAKE(VARIABLE)
|
||
# ---------------------------
|
||
@@ -935,13 +956,13 @@
|
||
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
||
|
||
# AM_SUBST_NOTMAKE(VARIABLE)
|
||
-# ---------------------------
|
||
+# --------------------------
|
||
# Public sister of _AM_SUBST_NOTMAKE.
|
||
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
||
|
||
# Check how to create a tarball. -*- Autoconf -*-
|
||
|
||
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
||
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
|
||
#
|
||
# This file is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy and/or distribute it,
|
||
@@ -963,10 +984,11 @@
|
||
# a tarball read from stdin.
|
||
# $(am__untar) < result.tar
|
||
AC_DEFUN([_AM_PROG_TAR],
|
||
-[# Always define AMTAR for backward compatibility.
|
||
-AM_MISSING_PROG([AMTAR], [tar])
|
||
+[# Always define AMTAR for backward compatibility. Yes, it's still used
|
||
+# in the wild :-( We should find a proper way to deprecate it ...
|
||
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
|
||
m4_if([$1], [v7],
|
||
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
|
||
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
|
||
[m4_case([$1], [ustar],, [pax],,
|
||
[m4_fatal([Unknown tar format])])
|
||
AC_MSG_CHECKING([how to create a $1 tar archive])
|
||
diff --git a/configure b/configure
|
||
--- a/configure
|
||
+++ b/configure
|
||
@@ -1,13 +1,13 @@
|
||
#! /bin/sh
|
||
# Guess values for system-dependent variables and create Makefiles.
|
||
-# Generated by GNU Autoconf 2.65 for breakpad 0.1.
|
||
+# Generated by GNU Autoconf 2.68 for breakpad 0.1.
|
||
#
|
||
# Report bugs to <google-breakpad-dev@googlegroups.com>.
|
||
#
|
||
#
|
||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||
-# Inc.
|
||
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
||
+# Foundation, Inc.
|
||
#
|
||
#
|
||
# This configure script is free software; the Free Software Foundation
|
||
@@ -91,6 +91,7 @@
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
+as_myself=
|
||
case $0 in #((
|
||
*[\\/]* ) as_myself=$0 ;;
|
||
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -216,11 +217,18 @@
|
||
# We cannot yet assume a decent shell, so we have to provide a
|
||
# neutralization value for shells without unset; and this also
|
||
# works around shells that cannot unset nonexistent variables.
|
||
+ # Preserve -v and -x to the replacement shell.
|
||
BASH_ENV=/dev/null
|
||
ENV=/dev/null
|
||
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
||
export CONFIG_SHELL
|
||
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
||
+ case $- in # ((((
|
||
+ *v*x* | *x*v* ) as_opts=-vx ;;
|
||
+ *v* ) as_opts=-v ;;
|
||
+ *x* ) as_opts=-x ;;
|
||
+ * ) as_opts= ;;
|
||
+ esac
|
||
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
||
fi
|
||
|
||
if test x$as_have_required = xno; then :
|
||
@@ -319,7 +327,7 @@
|
||
test -d "$as_dir" && break
|
||
done
|
||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||
|
||
|
||
} # as_fn_mkdir_p
|
||
@@ -359,19 +367,19 @@
|
||
fi # as_fn_arith
|
||
|
||
|
||
-# as_fn_error ERROR [LINENO LOG_FD]
|
||
-# ---------------------------------
|
||
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||
+# ----------------------------------------
|
||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
-# script with status $?, using 1 if that was 0.
|
||
+# script with STATUS, using 1 if that was 0.
|
||
as_fn_error ()
|
||
{
|
||
- as_status=$?; test $as_status -eq 0 && as_status=1
|
||
- if test "$3"; then
|
||
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
||
+ if test "$4"; then
|
||
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||
fi
|
||
- $as_echo "$as_me: error: $1" >&2
|
||
+ $as_echo "$as_me: error: $2" >&2
|
||
as_fn_exit $as_status
|
||
} # as_fn_error
|
||
|
||
@@ -533,7 +541,7 @@
|
||
exec 6>&1
|
||
|
||
# Name of the host.
|
||
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
||
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
|
||
# so uname gets run too.
|
||
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
|
||
@@ -632,6 +640,7 @@
|
||
am__fastdepCC_FALSE
|
||
am__fastdepCC_TRUE
|
||
CCDEPMODE
|
||
+am__nodep
|
||
AMDEPBACKSLASH
|
||
AMDEP_FALSE
|
||
AMDEP_TRUE
|
||
@@ -799,8 +808,9 @@
|
||
fi
|
||
|
||
case $ac_option in
|
||
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||
- *) ac_optarg=yes ;;
|
||
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||
+ *=) ac_optarg= ;;
|
||
+ *) ac_optarg=yes ;;
|
||
esac
|
||
|
||
# Accept the important Cygnus configure options, so we can diagnose typos.
|
||
@@ -845,7 +855,7 @@
|
||
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid feature name: $ac_useropt"
|
||
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -871,7 +881,7 @@
|
||
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid feature name: $ac_useropt"
|
||
+ as_fn_error $? "invalid feature name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1075,7 +1085,7 @@
|
||
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid package name: $ac_useropt"
|
||
+ as_fn_error $? "invalid package name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1091,7 +1101,7 @@
|
||
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
- as_fn_error "invalid package name: $ac_useropt"
|
||
+ as_fn_error $? "invalid package name: $ac_useropt"
|
||
ac_useropt_orig=$ac_useropt
|
||
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
case $ac_user_opts in
|
||
@@ -1121,8 +1131,8 @@
|
||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||
x_libraries=$ac_optarg ;;
|
||
|
||
- -*) as_fn_error "unrecognized option: \`$ac_option'
|
||
-Try \`$0 --help' for more information."
|
||
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
|
||
+Try \`$0 --help' for more information"
|
||
;;
|
||
|
||
*=*)
|
||
@@ -1130,7 +1140,7 @@
|
||
# Reject names that are not valid shell variable names.
|
||
case $ac_envvar in #(
|
||
'' | [0-9]* | *[!_$as_cr_alnum]* )
|
||
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
||
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
|
||
esac
|
||
eval $ac_envvar=\$ac_optarg
|
||
export $ac_envvar ;;
|
||
@@ -1140,7 +1150,7 @@
|
||
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
||
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
|
||
;;
|
||
|
||
esac
|
||
@@ -1148,13 +1158,13 @@
|
||
|
||
if test -n "$ac_prev"; then
|
||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||
- as_fn_error "missing argument to $ac_option"
|
||
+ as_fn_error $? "missing argument to $ac_option"
|
||
fi
|
||
|
||
if test -n "$ac_unrecognized_opts"; then
|
||
case $enable_option_checking in
|
||
no) ;;
|
||
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
||
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
|
||
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
||
esac
|
||
fi
|
||
@@ -1177,7 +1187,7 @@
|
||
[\\/$]* | ?:[\\/]* ) continue;;
|
||
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
||
esac
|
||
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
||
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
|
||
done
|
||
|
||
# There might be people who depend on the old broken behavior: `$host'
|
||
@@ -1191,8 +1201,8 @@
|
||
if test "x$host_alias" != x; then
|
||
if test "x$build_alias" = x; then
|
||
cross_compiling=maybe
|
||
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
- If a cross compiler is detected then cross compile mode will be used." >&2
|
||
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
||
+ If a cross compiler is detected then cross compile mode will be used" >&2
|
||
elif test "x$build_alias" != "x$host_alias"; then
|
||
cross_compiling=yes
|
||
fi
|
||
@@ -1207,9 +1217,9 @@
|
||
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
||
ac_ls_di=`ls -di .` &&
|
||
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
||
- as_fn_error "working directory cannot be determined"
|
||
+ as_fn_error $? "working directory cannot be determined"
|
||
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
||
- as_fn_error "pwd does not report name of working directory"
|
||
+ as_fn_error $? "pwd does not report name of working directory"
|
||
|
||
|
||
# Find the source files, if location was not specified.
|
||
@@ -1248,11 +1258,11 @@
|
||
fi
|
||
if test ! -r "$srcdir/$ac_unique_file"; then
|
||
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
||
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
||
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
|
||
fi
|
||
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
||
ac_abs_confdir=`(
|
||
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
||
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
|
||
pwd)`
|
||
# When building in place, set srcdir=.
|
||
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
||
@@ -1292,7 +1302,7 @@
|
||
--help=short display options specific to this package
|
||
--help=recursive display the short help of all the included packages
|
||
-V, --version display version information and exit
|
||
- -q, --quiet, --silent do not print \`checking...' messages
|
||
+ -q, --quiet, --silent do not print \`checking ...' messages
|
||
--cache-file=FILE cache test results in FILE [disabled]
|
||
-C, --config-cache alias for \`--cache-file=config.cache'
|
||
-n, --no-create do not create output files
|
||
@@ -1445,9 +1455,9 @@
|
||
if $ac_init_version; then
|
||
cat <<\_ACEOF
|
||
breakpad configure 0.1
|
||
-generated by GNU Autoconf 2.65
|
||
-
|
||
-Copyright (C) 2009 Free Software Foundation, Inc.
|
||
+generated by GNU Autoconf 2.68
|
||
+
|
||
+Copyright (C) 2010 Free Software Foundation, Inc.
|
||
This configure script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it.
|
||
_ACEOF
|
||
@@ -1491,7 +1501,7 @@
|
||
|
||
ac_retval=1
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_compile
|
||
@@ -1517,7 +1527,7 @@
|
||
mv -f conftest.er1 conftest.err
|
||
fi
|
||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
- test $ac_status = 0; } >/dev/null && {
|
||
+ test $ac_status = 0; } > conftest.i && {
|
||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
test ! -s conftest.err
|
||
}; then :
|
||
@@ -1528,7 +1538,7 @@
|
||
|
||
ac_retval=1
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_cpp
|
||
@@ -1566,7 +1576,7 @@
|
||
|
||
ac_retval=1
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_cxx_try_compile
|
||
@@ -1608,7 +1618,7 @@
|
||
ac_retval=$ac_status
|
||
fi
|
||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_run
|
||
@@ -1654,7 +1664,7 @@
|
||
# interfere with the next link command; also delete a directory that is
|
||
# left behind by Apple's compiler. We do this before executing the actions.
|
||
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
as_fn_set_status $ac_retval
|
||
|
||
} # ac_fn_c_try_link
|
||
@@ -1667,10 +1677,10 @@
|
||
ac_fn_c_check_header_mongrel ()
|
||
{
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ if eval \${$3+:} false; then :
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
fi
|
||
eval ac_res=\$$3
|
||
@@ -1706,7 +1716,7 @@
|
||
else
|
||
ac_header_preproc=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
||
$as_echo "$ac_header_preproc" >&6; }
|
||
|
||
@@ -1729,17 +1739,15 @@
|
||
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
||
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
||
-( cat <<\_ASBOX
|
||
-## --------------------------------------------------- ##
|
||
+( $as_echo "## --------------------------------------------------- ##
|
||
## Report this to google-breakpad-dev@googlegroups.com ##
|
||
-## --------------------------------------------------- ##
|
||
-_ASBOX
|
||
+## --------------------------------------------------- ##"
|
||
) | sed "s/^/$as_me: WARNING: /" >&2
|
||
;;
|
||
esac
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
eval "$3=\$ac_header_compiler"
|
||
@@ -1748,7 +1756,7 @@
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
fi
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_header_mongrel
|
||
|
||
@@ -1761,7 +1769,7 @@
|
||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
$as_echo_n "checking for $2... " >&6; }
|
||
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${$3+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -1779,7 +1787,7 @@
|
||
eval ac_res=\$$3
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
$as_echo "$ac_res" >&6; }
|
||
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||
|
||
} # ac_fn_c_check_header_compile
|
||
cat >config.log <<_ACEOF
|
||
@@ -1787,7 +1795,7 @@
|
||
running configure, to aid debugging if configure makes a mistake.
|
||
|
||
It was created by breakpad $as_me 0.1, which was
|
||
-generated by GNU Autoconf 2.65. Invocation command line was
|
||
+generated by GNU Autoconf 2.68. Invocation command line was
|
||
|
||
$ $0 $@
|
||
|
||
@@ -1897,11 +1905,9 @@
|
||
{
|
||
echo
|
||
|
||
- cat <<\_ASBOX
|
||
-## ---------------- ##
|
||
+ $as_echo "## ---------------- ##
|
||
## Cache variables. ##
|
||
-## ---------------- ##
|
||
-_ASBOX
|
||
+## ---------------- ##"
|
||
echo
|
||
# The following way of writing the cache mishandles newlines in values,
|
||
(
|
||
@@ -1935,11 +1941,9 @@
|
||
)
|
||
echo
|
||
|
||
- cat <<\_ASBOX
|
||
-## ----------------- ##
|
||
+ $as_echo "## ----------------- ##
|
||
## Output variables. ##
|
||
-## ----------------- ##
|
||
-_ASBOX
|
||
+## ----------------- ##"
|
||
echo
|
||
for ac_var in $ac_subst_vars
|
||
do
|
||
@@ -1952,11 +1956,9 @@
|
||
echo
|
||
|
||
if test -n "$ac_subst_files"; then
|
||
- cat <<\_ASBOX
|
||
-## ------------------- ##
|
||
+ $as_echo "## ------------------- ##
|
||
## File substitutions. ##
|
||
-## ------------------- ##
|
||
-_ASBOX
|
||
+## ------------------- ##"
|
||
echo
|
||
for ac_var in $ac_subst_files
|
||
do
|
||
@@ -1970,11 +1972,9 @@
|
||
fi
|
||
|
||
if test -s confdefs.h; then
|
||
- cat <<\_ASBOX
|
||
-## ----------- ##
|
||
+ $as_echo "## ----------- ##
|
||
## confdefs.h. ##
|
||
-## ----------- ##
|
||
-_ASBOX
|
||
+## ----------- ##"
|
||
echo
|
||
cat confdefs.h
|
||
echo
|
||
@@ -2029,7 +2029,12 @@
|
||
ac_site_file1=NONE
|
||
ac_site_file2=NONE
|
||
if test -n "$CONFIG_SITE"; then
|
||
- ac_site_file1=$CONFIG_SITE
|
||
+ # We do not want a PATH search for config.site.
|
||
+ case $CONFIG_SITE in #((
|
||
+ -*) ac_site_file1=./$CONFIG_SITE;;
|
||
+ */*) ac_site_file1=$CONFIG_SITE;;
|
||
+ *) ac_site_file1=./$CONFIG_SITE;;
|
||
+ esac
|
||
elif test "x$prefix" != xNONE; then
|
||
ac_site_file1=$prefix/share/config.site
|
||
ac_site_file2=$prefix/etc/config.site
|
||
@@ -2044,7 +2049,11 @@
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
||
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
sed 's/^/| /' "$ac_site_file" >&5
|
||
- . "$ac_site_file"
|
||
+ . "$ac_site_file" \
|
||
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error $? "failed to load site script $ac_site_file
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
done
|
||
|
||
@@ -2120,7 +2129,7 @@
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
||
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||
fi
|
||
## -------------------- ##
|
||
## Main body of script. ##
|
||
@@ -2136,16 +2145,22 @@
|
||
|
||
ac_aux_dir=
|
||
for ac_dir in autotools "$srcdir"/autotools; do
|
||
- for ac_t in install-sh install.sh shtool; do
|
||
- if test -f "$ac_dir/$ac_t"; then
|
||
- ac_aux_dir=$ac_dir
|
||
- ac_install_sh="$ac_aux_dir/$ac_t -c"
|
||
- break 2
|
||
- fi
|
||
- done
|
||
+ if test -f "$ac_dir/install-sh"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/install-sh -c"
|
||
+ break
|
||
+ elif test -f "$ac_dir/install.sh"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/install.sh -c"
|
||
+ break
|
||
+ elif test -f "$ac_dir/shtool"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/shtool install -c"
|
||
+ break
|
||
+ fi
|
||
done
|
||
if test -z "$ac_aux_dir"; then
|
||
- as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
|
||
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
|
||
fi
|
||
|
||
# These three variables are undocumented and unsupported,
|
||
@@ -2160,27 +2175,27 @@
|
||
|
||
# Make sure we can run config.sub.
|
||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
||
$as_echo_n "checking build system type... " >&6; }
|
||
-if test "${ac_cv_build+set}" = set; then :
|
||
+if ${ac_cv_build+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_build_alias=$build_alias
|
||
test "x$ac_build_alias" = x &&
|
||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||
test "x$ac_build_alias" = x &&
|
||
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
|
||
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
|
||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
||
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
||
$as_echo "$ac_cv_build" >&6; }
|
||
case $ac_cv_build in
|
||
*-*-*) ;;
|
||
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
||
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
|
||
esac
|
||
build=$ac_cv_build
|
||
ac_save_IFS=$IFS; IFS='-'
|
||
@@ -2198,14 +2213,14 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
||
$as_echo_n "checking host system type... " >&6; }
|
||
-if test "${ac_cv_host+set}" = set; then :
|
||
+if ${ac_cv_host+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test "x$host_alias" = x; then
|
||
ac_cv_host=$ac_cv_build
|
||
else
|
||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
||
fi
|
||
|
||
fi
|
||
@@ -2213,7 +2228,7 @@
|
||
$as_echo "$ac_cv_host" >&6; }
|
||
case $ac_cv_host in
|
||
*-*-*) ;;
|
||
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
||
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
|
||
esac
|
||
host=$ac_cv_host
|
||
ac_save_IFS=$IFS; IFS='-'
|
||
@@ -2249,7 +2264,7 @@
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
||
$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
||
if test -z "$INSTALL"; then
|
||
-if test "${ac_cv_path_install+set}" = set; then :
|
||
+if ${ac_cv_path_install+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -2336,11 +2351,11 @@
|
||
'
|
||
case `pwd` in
|
||
*[\\\"\#\$\&\'\`$am_lf]*)
|
||
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
|
||
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
|
||
esac
|
||
case $srcdir in
|
||
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
||
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
||
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
||
esac
|
||
|
||
# Do `set' in a subshell so we don't clobber the current shell's
|
||
@@ -2362,7 +2377,7 @@
|
||
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
||
# broken ls alias from the environment. This has actually
|
||
# happened. Such a system could not be considered "sane".
|
||
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
||
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
|
||
alias in your environment" "$LINENO" 5
|
||
fi
|
||
|
||
@@ -2372,7 +2387,7 @@
|
||
# Ok.
|
||
:
|
||
else
|
||
- as_fn_error "newly created file is older than distributed files!
|
||
+ as_fn_error $? "newly created file is older than distributed files!
|
||
Check your system clock" "$LINENO" 5
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
@@ -2426,7 +2441,7 @@
|
||
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_STRIP+set}" = set; then :
|
||
+if ${ac_cv_prog_STRIP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$STRIP"; then
|
||
@@ -2466,7 +2481,7 @@
|
||
set dummy strip; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_STRIP"; then
|
||
@@ -2519,7 +2534,7 @@
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
||
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
||
if test -z "$MKDIR_P"; then
|
||
- if test "${ac_cv_path_mkdir+set}" = set; then :
|
||
+ if ${ac_cv_path_mkdir+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -2570,7 +2585,7 @@
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_AWK+set}" = set; then :
|
||
+if ${ac_cv_prog_AWK+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$AWK"; then
|
||
@@ -2610,7 +2625,7 @@
|
||
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
||
set x ${MAKE-make}
|
||
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
||
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat >conftest.make <<\_ACEOF
|
||
@@ -2618,7 +2633,7 @@
|
||
all:
|
||
@echo '@@@%%%=$(MAKE)=@@@%%%'
|
||
_ACEOF
|
||
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
|
||
case `${MAKE-make} -f conftest.make 2>/dev/null` in
|
||
*@@@%%%=?*=@@@%%%*)
|
||
eval ac_cv_prog_make_${ac_make}_set=yes;;
|
||
@@ -2652,7 +2667,7 @@
|
||
am__isrc=' -I$(srcdir)'
|
||
# test to see if srcdir already configured
|
||
if test -f $srcdir/config.status; then
|
||
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
||
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
||
fi
|
||
fi
|
||
|
||
@@ -2698,9 +2713,9 @@
|
||
|
||
# We need awk for the "check" target. The system "awk" is bad on
|
||
# some platforms.
|
||
-# Always define AMTAR for backward compatibility.
|
||
-
|
||
-AMTAR=${AMTAR-"${am_missing_run}tar"}
|
||
+# Always define AMTAR for backward compatibility. Yes, it's still used
|
||
+# in the wild :-( We should find a proper way to deprecate it ...
|
||
+AMTAR='$${TAR-tar}'
|
||
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
|
||
@@ -2776,7 +2791,7 @@
|
||
done
|
||
rm -rf conftest.dir
|
||
|
||
-if test "${am_cv_prog_tar_ustar+set}" = set; then :
|
||
+if ${am_cv_prog_tar_ustar+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
am_cv_prog_tar_ustar=$_am_tool
|
||
@@ -2844,6 +2859,7 @@
|
||
if test "x$enable_dependency_tracking" != xno; then
|
||
am_depcomp="$ac_aux_dir/depcomp"
|
||
AMDEPBACKSLASH='\'
|
||
+ am__nodep='_no'
|
||
fi
|
||
if test "x$enable_dependency_tracking" != xno; then
|
||
AMDEP_TRUE=
|
||
@@ -2864,7 +2880,7 @@
|
||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2904,7 +2920,7 @@
|
||
set dummy gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -2957,7 +2973,7 @@
|
||
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -2997,7 +3013,7 @@
|
||
set dummy cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -3056,7 +3072,7 @@
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -3100,7 +3116,7 @@
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -3154,8 +3170,8 @@
|
||
|
||
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
|
||
# Provide some information about the compiler.
|
||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||
@@ -3269,9 +3285,8 @@
|
||
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-{ as_fn_set_status 77
|
||
-as_fn_error "C compiler cannot create executables
|
||
-See \`config.log' for more details." "$LINENO" 5; }; }
|
||
+as_fn_error 77 "C compiler cannot create executables
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
else
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
$as_echo "yes" >&6; }
|
||
@@ -3313,8 +3328,8 @@
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
rm -f conftest conftest$ac_cv_exeext
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
||
@@ -3371,9 +3386,9 @@
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot run C compiled programs.
|
||
+as_fn_error $? "cannot run C compiled programs.
|
||
If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
fi
|
||
fi
|
||
@@ -3384,7 +3399,7 @@
|
||
ac_clean_files=$ac_clean_files_save
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
||
$as_echo_n "checking for suffix of object files... " >&6; }
|
||
-if test "${ac_cv_objext+set}" = set; then :
|
||
+if ${ac_cv_objext+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -3424,8 +3439,8 @@
|
||
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "cannot compute suffix of object files: cannot compile
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
fi
|
||
@@ -3435,7 +3450,7 @@
|
||
ac_objext=$OBJEXT
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
||
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
||
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
||
+if ${ac_cv_c_compiler_gnu+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -3472,7 +3487,7 @@
|
||
ac_save_CFLAGS=$CFLAGS
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
||
$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
||
-if test "${ac_cv_prog_cc_g+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_g+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_save_c_werror_flag=$ac_c_werror_flag
|
||
@@ -3550,7 +3565,7 @@
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
||
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
||
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_c89+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_cv_prog_cc_c89=no
|
||
@@ -3649,7 +3664,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
||
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
||
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
||
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||
@@ -3658,6 +3673,7 @@
|
||
# instance it was reported that on HP-UX the gcc test will end up
|
||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||
# in D'.
|
||
+ rm -rf conftest.dir
|
||
mkdir conftest.dir
|
||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||
# using a relative directory.
|
||
@@ -3717,7 +3733,7 @@
|
||
break
|
||
fi
|
||
;;
|
||
- msvisualcpp | msvcmsys)
|
||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||
# This compiler won't grok `-c -o', but also, the minuso test has
|
||
# not run yet. These depmodes are late enough in the game, and
|
||
# so weak that their functioning should not be impacted.
|
||
@@ -3783,7 +3799,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
||
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
||
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
|
||
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||
@@ -3792,6 +3808,7 @@
|
||
# instance it was reported that on HP-UX the gcc test will end up
|
||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||
# in D'.
|
||
+ rm -rf conftest.dir
|
||
mkdir conftest.dir
|
||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||
# using a relative directory.
|
||
@@ -3849,7 +3866,7 @@
|
||
break
|
||
fi
|
||
;;
|
||
- msvisualcpp | msvcmsys)
|
||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||
# This compiler won't grok `-c -o', but also, the minuso test has
|
||
# not run yet. These depmodes are late enough in the game, and
|
||
# so weak that their functioning should not be impacted.
|
||
@@ -3914,7 +3931,7 @@
|
||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -3954,7 +3971,7 @@
|
||
set dummy gcc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -4007,7 +4024,7 @@
|
||
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -4047,7 +4064,7 @@
|
||
set dummy cc; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -4106,7 +4123,7 @@
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
@@ -4150,7 +4167,7 @@
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
@@ -4204,8 +4221,8 @@
|
||
|
||
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
|
||
# Provide some information about the compiler.
|
||
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||
@@ -4234,7 +4251,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
||
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
||
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
||
+if ${ac_cv_c_compiler_gnu+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -4271,7 +4288,7 @@
|
||
ac_save_CFLAGS=$CFLAGS
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
||
$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
||
-if test "${ac_cv_prog_cc_g+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_g+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_save_c_werror_flag=$ac_c_werror_flag
|
||
@@ -4349,7 +4366,7 @@
|
||
fi
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
||
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
||
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
||
+if ${ac_cv_prog_cc_c89+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_cv_prog_cc_c89=no
|
||
@@ -4448,7 +4465,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
||
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
||
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
||
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||
@@ -4457,6 +4474,7 @@
|
||
# instance it was reported that on HP-UX the gcc test will end up
|
||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||
# in D'.
|
||
+ rm -rf conftest.dir
|
||
mkdir conftest.dir
|
||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||
# using a relative directory.
|
||
@@ -4516,7 +4534,7 @@
|
||
break
|
||
fi
|
||
;;
|
||
- msvisualcpp | msvcmsys)
|
||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||
# This compiler won't grok `-c -o', but also, the minuso test has
|
||
# not run yet. These depmodes are late enough in the game, and
|
||
# so weak that their functioning should not be impacted.
|
||
@@ -4580,7 +4598,7 @@
|
||
fi
|
||
set dummy $CC; ac_cc=`$as_echo "$2" |
|
||
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
|
||
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -4709,7 +4727,7 @@
|
||
CPP=
|
||
fi
|
||
if test -z "$CPP"; then
|
||
- if test "${ac_cv_prog_CPP+set}" = set; then :
|
||
+ if ${ac_cv_prog_CPP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
# Double quotes because CPP needs to be expanded
|
||
@@ -4739,7 +4757,7 @@
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
# OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
@@ -4755,11 +4773,11 @@
|
||
ac_preproc_ok=:
|
||
break
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.i conftest.err conftest.$ac_ext
|
||
if $ac_preproc_ok; then :
|
||
break
|
||
fi
|
||
@@ -4798,7 +4816,7 @@
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
# OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
@@ -4814,18 +4832,18 @@
|
||
ac_preproc_ok=:
|
||
break
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
||
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
+rm -f conftest.i conftest.err conftest.$ac_ext
|
||
if $ac_preproc_ok; then :
|
||
|
||
else
|
||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
||
-See \`config.log' for more details." "$LINENO" 5; }
|
||
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
||
+See \`config.log' for more details" "$LINENO" 5; }
|
||
fi
|
||
|
||
ac_ext=c
|
||
@@ -4850,7 +4868,7 @@
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_CXX+set}" = set; then :
|
||
+if ${ac_cv_prog_CXX+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CXX"; then
|
||
@@ -4894,7 +4912,7 @@
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CXX"; then
|
||
@@ -4972,7 +4990,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
|
||
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
|
||
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
|
||
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -5009,7 +5027,7 @@
|
||
ac_save_CXXFLAGS=$CXXFLAGS
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
|
||
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
|
||
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
|
||
+if ${ac_cv_prog_cxx_g+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
|
||
@@ -5095,7 +5113,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
||
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
||
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
|
||
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||
@@ -5104,6 +5122,7 @@
|
||
# instance it was reported that on HP-UX the gcc test will end up
|
||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||
# in D'.
|
||
+ rm -rf conftest.dir
|
||
mkdir conftest.dir
|
||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||
# using a relative directory.
|
||
@@ -5163,7 +5182,7 @@
|
||
break
|
||
fi
|
||
;;
|
||
- msvisualcpp | msvcmsys)
|
||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
||
# This compiler won't grok `-c -o', but also, the minuso test has
|
||
# not run yet. These depmodes are late enough in the game, and
|
||
# so weak that their functioning should not be impacted.
|
||
@@ -5223,7 +5242,7 @@
|
||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
||
+if ${ac_cv_prog_RANLIB+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$RANLIB"; then
|
||
@@ -5263,7 +5282,7 @@
|
||
set dummy ranlib; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
||
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_RANLIB"; then
|
||
@@ -5323,7 +5342,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||
-if test "${ac_cv_path_GREP+set}" = set; then :
|
||
+if ${ac_cv_path_GREP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -z "$GREP"; then
|
||
@@ -5372,7 +5391,7 @@
|
||
done
|
||
IFS=$as_save_IFS
|
||
if test -z "$ac_cv_path_GREP"; then
|
||
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
fi
|
||
else
|
||
ac_cv_path_GREP=$GREP
|
||
@@ -5386,7 +5405,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
||
$as_echo_n "checking for egrep... " >&6; }
|
||
-if test "${ac_cv_path_EGREP+set}" = set; then :
|
||
+if ${ac_cv_path_EGREP+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||
@@ -5438,7 +5457,7 @@
|
||
done
|
||
IFS=$as_save_IFS
|
||
if test -z "$ac_cv_path_EGREP"; then
|
||
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
fi
|
||
else
|
||
ac_cv_path_EGREP=$EGREP
|
||
@@ -5453,7 +5472,7 @@
|
||
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
||
$as_echo_n "checking for ANSI C header files... " >&6; }
|
||
-if test "${ac_cv_header_stdc+set}" = set; then :
|
||
+if ${ac_cv_header_stdc+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
@@ -5790,7 +5809,7 @@
|
||
set dummy pthread-config; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_ax_pthread_config+set}" = set; then :
|
||
+if ${ac_cv_prog_ax_pthread_config+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ax_pthread_config"; then
|
||
@@ -5951,7 +5970,7 @@
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
$as_echo_n "checking for $ac_word... " >&6; }
|
||
-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
|
||
+if ${ac_cv_prog_PTHREAD_CC+:} false; then :
|
||
$as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$PTHREAD_CC"; then
|
||
@@ -6023,8 +6042,7 @@
|
||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
||
"
|
||
-eval as_val=\$$as_ac_Header
|
||
- if test "x$as_val" = x""yes; then :
|
||
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
@@ -6037,7 +6055,7 @@
|
||
for ac_header in a.out.h
|
||
do :
|
||
ac_fn_c_check_header_mongrel "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default"
|
||
-if test "x$ac_cv_header_a_out_h" = x""yes; then :
|
||
+if test "x$ac_cv_header_a_out_h" = xyes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_A_OUT_H 1
|
||
_ACEOF
|
||
@@ -6089,7 +6107,7 @@
|
||
usem32=false
|
||
;;
|
||
*)
|
||
- as_fn_error "bad value ${enableval} for --enable-m32" "$LINENO" 5
|
||
+ as_fn_error $? "bad value ${enableval} for --enable-m32" "$LINENO" 5
|
||
;;
|
||
esac
|
||
else
|
||
@@ -6107,7 +6125,7 @@
|
||
disable_processor=true
|
||
;;
|
||
*)
|
||
- as_fn_error "bad value ${enableval} for --disable-processor" "$LINENO" 5
|
||
+ as_fn_error $? "bad value ${enableval} for --disable-processor" "$LINENO" 5
|
||
;;
|
||
esac
|
||
else
|
||
@@ -6133,7 +6151,7 @@
|
||
disable_tools=true
|
||
;;
|
||
*)
|
||
- as_fn_error "bad value ${enableval} for --disable-tools" "$LINENO" 5
|
||
+ as_fn_error $? "bad value ${enableval} for --disable-tools" "$LINENO" 5
|
||
;;
|
||
esac
|
||
else
|
||
@@ -6150,7 +6168,7 @@
|
||
|
||
|
||
if test x$LINUX_HOST = xfalse -a x$disable_processor = xtrue -a x$disable_tools = xtrue; then
|
||
- as_fn_error "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
|
||
+ as_fn_error $? "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
|
||
fi
|
||
|
||
# Check whether --enable-selftest was given.
|
||
@@ -6163,7 +6181,7 @@
|
||
selftest=false
|
||
;;
|
||
*)
|
||
- as_fn_error "bad value ${enableval} for --enable-selftest" "$LINENO" 5
|
||
+ as_fn_error $? "bad value ${enableval} for --enable-selftest" "$LINENO" 5
|
||
;;
|
||
esac
|
||
else
|
||
@@ -6245,10 +6263,21 @@
|
||
:end' >>confcache
|
||
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
||
if test -w "$cache_file"; then
|
||
- test "x$cache_file" != "x/dev/null" &&
|
||
+ if test "x$cache_file" != "x/dev/null"; then
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
||
$as_echo "$as_me: updating cache $cache_file" >&6;}
|
||
- cat confcache >$cache_file
|
||
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
|
||
+ cat confcache >"$cache_file"
|
||
+ else
|
||
+ case $cache_file in #(
|
||
+ */* | ?:*)
|
||
+ mv -f confcache "$cache_file"$$ &&
|
||
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
|
||
+ *)
|
||
+ mv -f confcache "$cache_file" ;;
|
||
+ esac
|
||
+ fi
|
||
+ fi
|
||
else
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
||
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
||
@@ -6264,6 +6293,7 @@
|
||
|
||
ac_libobjs=
|
||
ac_ltlibobjs=
|
||
+U=
|
||
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
||
# 1. Remove the extension, and $U if already installed.
|
||
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
||
@@ -6287,51 +6317,51 @@
|
||
fi
|
||
|
||
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
||
- as_fn_error "conditional \"AMDEP\" was never defined.
|
||
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
||
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
||
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
|
||
- as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
|
||
+ as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
||
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
||
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
|
||
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
|
||
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
|
||
- as_fn_error "conditional \"GCC\" was never defined.
|
||
+ as_fn_error $? "conditional \"GCC\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then
|
||
- as_fn_error "conditional \"LINUX_HOST\" was never defined.
|
||
+ as_fn_error $? "conditional \"LINUX_HOST\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then
|
||
- as_fn_error "conditional \"ANDROID_HOST\" was never defined.
|
||
+ as_fn_error $? "conditional \"ANDROID_HOST\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then
|
||
- as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined.
|
||
+ as_fn_error $? "conditional \"DISABLE_PROCESSOR\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${DISABLE_TOOLS_TRUE}" && test -z "${DISABLE_TOOLS_FALSE}"; then
|
||
- as_fn_error "conditional \"DISABLE_TOOLS\" was never defined.
|
||
+ as_fn_error $? "conditional \"DISABLE_TOOLS\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
if test -z "${SELFTEST_TRUE}" && test -z "${SELFTEST_FALSE}"; then
|
||
- as_fn_error "conditional \"SELFTEST\" was never defined.
|
||
+ as_fn_error $? "conditional \"SELFTEST\" was never defined.
|
||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||
fi
|
||
|
||
-: ${CONFIG_STATUS=./config.status}
|
||
+: "${CONFIG_STATUS=./config.status}"
|
||
ac_write_fail=0
|
||
ac_clean_files_save=$ac_clean_files
|
||
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
||
@@ -6432,6 +6462,7 @@
|
||
IFS=" "" $as_nl"
|
||
|
||
# Find who we are. Look in the path if we contain no directory separator.
|
||
+as_myself=
|
||
case $0 in #((
|
||
*[\\/]* ) as_myself=$0 ;;
|
||
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
@@ -6477,19 +6508,19 @@
|
||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||
|
||
|
||
-# as_fn_error ERROR [LINENO LOG_FD]
|
||
-# ---------------------------------
|
||
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
|
||
+# ----------------------------------------
|
||
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
-# script with status $?, using 1 if that was 0.
|
||
+# script with STATUS, using 1 if that was 0.
|
||
as_fn_error ()
|
||
{
|
||
- as_status=$?; test $as_status -eq 0 && as_status=1
|
||
- if test "$3"; then
|
||
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ as_status=$1; test $as_status -eq 0 && as_status=1
|
||
+ if test "$4"; then
|
||
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
|
||
fi
|
||
- $as_echo "$as_me: error: $1" >&2
|
||
+ $as_echo "$as_me: error: $2" >&2
|
||
as_fn_exit $as_status
|
||
} # as_fn_error
|
||
|
||
@@ -6685,7 +6716,7 @@
|
||
test -d "$as_dir" && break
|
||
done
|
||
test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
|
||
|
||
|
||
} # as_fn_mkdir_p
|
||
@@ -6739,7 +6770,7 @@
|
||
# values after options handling.
|
||
ac_log="
|
||
This file was extended by breakpad $as_me 0.1, which was
|
||
-generated by GNU Autoconf 2.65. Invocation command line was
|
||
+generated by GNU Autoconf 2.68. Invocation command line was
|
||
|
||
CONFIG_FILES = $CONFIG_FILES
|
||
CONFIG_HEADERS = $CONFIG_HEADERS
|
||
@@ -6805,10 +6836,10 @@
|
||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||
ac_cs_version="\\
|
||
breakpad config.status 0.1
|
||
-configured by $0, generated by GNU Autoconf 2.65,
|
||
+configured by $0, generated by GNU Autoconf 2.68,
|
||
with options \\"\$ac_cs_config\\"
|
||
|
||
-Copyright (C) 2009 Free Software Foundation, Inc.
|
||
+Copyright (C) 2010 Free Software Foundation, Inc.
|
||
This config.status script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it."
|
||
|
||
@@ -6826,11 +6857,16 @@
|
||
while test $# != 0
|
||
do
|
||
case $1 in
|
||
- --*=*)
|
||
+ --*=?*)
|
||
ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
||
ac_shift=:
|
||
;;
|
||
+ --*=)
|
||
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||
+ ac_optarg=
|
||
+ ac_shift=:
|
||
+ ;;
|
||
*)
|
||
ac_option=$1
|
||
ac_optarg=$2
|
||
@@ -6852,6 +6888,7 @@
|
||
$ac_shift
|
||
case $ac_optarg in
|
||
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ '') as_fn_error $? "missing file argument" ;;
|
||
esac
|
||
as_fn_append CONFIG_FILES " '$ac_optarg'"
|
||
ac_need_defaults=false;;
|
||
@@ -6864,7 +6901,7 @@
|
||
ac_need_defaults=false;;
|
||
--he | --h)
|
||
# Conflict between --help and --header
|
||
- as_fn_error "ambiguous option: \`$1'
|
||
+ as_fn_error $? "ambiguous option: \`$1'
|
||
Try \`$0 --help' for more information.";;
|
||
--help | --hel | -h )
|
||
$as_echo "$ac_cs_usage"; exit ;;
|
||
@@ -6873,7 +6910,7 @@
|
||
ac_cs_silent=: ;;
|
||
|
||
# This is an error.
|
||
- -*) as_fn_error "unrecognized option: \`$1'
|
||
+ -*) as_fn_error $? "unrecognized option: \`$1'
|
||
Try \`$0 --help' for more information." ;;
|
||
|
||
*) as_fn_append ac_config_targets " $1"
|
||
@@ -6931,7 +6968,7 @@
|
||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||
|
||
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||
esac
|
||
done
|
||
|
||
@@ -6954,9 +6991,10 @@
|
||
# after its creation but before its name has been assigned to `$tmp'.
|
||
$debug ||
|
||
{
|
||
- tmp=
|
||
+ tmp= ac_tmp=
|
||
trap 'exit_status=$?
|
||
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
||
+ : "${ac_tmp:=$tmp}"
|
||
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
|
||
' 0
|
||
trap 'as_fn_exit 1' 1 2 13 15
|
||
}
|
||
@@ -6964,12 +7002,13 @@
|
||
|
||
{
|
||
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
||
- test -n "$tmp" && test -d "$tmp"
|
||
+ test -d "$tmp"
|
||
} ||
|
||
{
|
||
tmp=./conf$$-$RANDOM
|
||
(umask 077 && mkdir "$tmp")
|
||
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
||
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
||
+ac_tmp=$tmp
|
||
|
||
# Set up the scripts for CONFIG_FILES section.
|
||
# No need to generate them if there are no CONFIG_FILES.
|
||
@@ -6986,12 +7025,12 @@
|
||
fi
|
||
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||
- ac_cs_awk_cr='\r'
|
||
+ ac_cs_awk_cr='\\r'
|
||
else
|
||
ac_cs_awk_cr=$ac_cr
|
||
fi
|
||
|
||
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
||
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
|
||
_ACEOF
|
||
|
||
|
||
@@ -7000,18 +7039,18 @@
|
||
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
||
echo "_ACEOF"
|
||
} >conf$$subs.sh ||
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
||
ac_delim='%!_!# '
|
||
for ac_last_try in false false false false false :; do
|
||
. ./conf$$subs.sh ||
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
|
||
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
||
if test $ac_delim_n = $ac_delim_num; then
|
||
break
|
||
elif $ac_last_try; then
|
||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
else
|
||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
fi
|
||
@@ -7019,7 +7058,7 @@
|
||
rm -f conf$$subs.sh
|
||
|
||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
||
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
|
||
_ACEOF
|
||
sed -n '
|
||
h
|
||
@@ -7067,7 +7106,7 @@
|
||
rm -f conf$$subs.awk
|
||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
_ACAWK
|
||
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
||
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
|
||
for (key in S) S_is_set[key] = 1
|
||
FS = ""
|
||
|
||
@@ -7099,21 +7138,29 @@
|
||
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
||
else
|
||
cat
|
||
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
||
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
||
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|
||
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
|
||
_ACEOF
|
||
|
||
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
|
||
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
|
||
# trailing colons and then remove the whole line if VPATH becomes empty
|
||
# (actually we leave an empty line to preserve line numbers).
|
||
if test "x$srcdir" = x.; then
|
||
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
||
-s/:*\$(srcdir):*/:/
|
||
-s/:*\${srcdir}:*/:/
|
||
-s/:*@srcdir@:*/:/
|
||
-s/^\([^=]*=[ ]*\):*/\1/
|
||
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
|
||
+h
|
||
+s///
|
||
+s/^/:/
|
||
+s/[ ]*$/:/
|
||
+s/:\$(srcdir):/:/g
|
||
+s/:\${srcdir}:/:/g
|
||
+s/:@srcdir@:/:/g
|
||
+s/^:*//
|
||
s/:*$//
|
||
+x
|
||
+s/\(=[ ]*\).*/\1/
|
||
+G
|
||
+s/\n//
|
||
s/^[^=]*=[ ]*$//
|
||
}'
|
||
fi
|
||
@@ -7125,7 +7172,7 @@
|
||
# No need to generate them if there are no CONFIG_HEADERS.
|
||
# This happens for instance with `./config.status Makefile'.
|
||
if test -n "$CONFIG_HEADERS"; then
|
||
-cat >"$tmp/defines.awk" <<\_ACAWK ||
|
||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
|
||
BEGIN {
|
||
_ACEOF
|
||
|
||
@@ -7137,11 +7184,11 @@
|
||
# handling of long lines.
|
||
ac_delim='%!_!# '
|
||
for ac_last_try in false false :; do
|
||
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
|
||
- if test -z "$ac_t"; then
|
||
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
|
||
+ if test -z "$ac_tt"; then
|
||
break
|
||
elif $ac_last_try; then
|
||
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
||
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
|
||
else
|
||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
fi
|
||
@@ -7226,7 +7273,7 @@
|
||
_ACAWK
|
||
_ACEOF
|
||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
|
||
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
|
||
fi # test -n "$CONFIG_HEADERS"
|
||
|
||
|
||
@@ -7239,7 +7286,7 @@
|
||
esac
|
||
case $ac_mode$ac_tag in
|
||
:[FHL]*:*);;
|
||
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
||
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
||
:[FH]-) ac_tag=-:-;;
|
||
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
||
esac
|
||
@@ -7258,7 +7305,7 @@
|
||
for ac_f
|
||
do
|
||
case $ac_f in
|
||
- -) ac_f="$tmp/stdin";;
|
||
+ -) ac_f="$ac_tmp/stdin";;
|
||
*) # Look for the file first in the build tree, then in the source tree
|
||
# (if the path is not absolute). The absolute path cannot be DOS-style,
|
||
# because $ac_f cannot contain `:'.
|
||
@@ -7267,7 +7314,7 @@
|
||
[\\/$]*) false;;
|
||
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
||
esac ||
|
||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
||
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
||
esac
|
||
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
||
as_fn_append ac_file_inputs " '$ac_f'"
|
||
@@ -7293,8 +7340,8 @@
|
||
esac
|
||
|
||
case $ac_tag in
|
||
- *:-:* | *:-) cat >"$tmp/stdin" \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
||
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
|
||
esac
|
||
;;
|
||
esac
|
||
@@ -7430,23 +7477,24 @@
|
||
s&@MKDIR_P@&$ac_MKDIR_P&;t t
|
||
$ac_datarootdir_hack
|
||
"
|
||
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
|
||
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
|
||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
||
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
|
||
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
|
||
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
-which seems to be undefined. Please make sure it is defined." >&5
|
||
+which seems to be undefined. Please make sure it is defined" >&5
|
||
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
-which seems to be undefined. Please make sure it is defined." >&2;}
|
||
-
|
||
- rm -f "$tmp/stdin"
|
||
+which seems to be undefined. Please make sure it is defined" >&2;}
|
||
+
|
||
+ rm -f "$ac_tmp/stdin"
|
||
case $ac_file in
|
||
- -) cat "$tmp/out" && rm -f "$tmp/out";;
|
||
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
||
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
|
||
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
|
||
esac \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
;;
|
||
:H)
|
||
#
|
||
@@ -7455,21 +7503,21 @@
|
||
if test x"$ac_file" != x-; then
|
||
{
|
||
$as_echo "/* $configure_input */" \
|
||
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
||
- } >"$tmp/config.h" \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
|
||
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
|
||
+ } >"$ac_tmp/config.h" \
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
|
||
$as_echo "$as_me: $ac_file is unchanged" >&6;}
|
||
else
|
||
rm -f "$ac_file"
|
||
- mv "$tmp/config.h" "$ac_file" \
|
||
- || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ mv "$ac_tmp/config.h" "$ac_file" \
|
||
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
||
fi
|
||
else
|
||
$as_echo "/* $configure_input */" \
|
||
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
||
- || as_fn_error "could not create -" "$LINENO" 5
|
||
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|
||
+ || as_fn_error $? "could not create -" "$LINENO" 5
|
||
fi
|
||
# Compute "$ac_file"'s index in $config_headers.
|
||
_am_arg="$ac_file"
|
||
@@ -7619,7 +7667,7 @@
|
||
ac_clean_files=$ac_clean_files_save
|
||
|
||
test $ac_write_fail = 0 ||
|
||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||
|
||
|
||
# configure is writing to config.log, and then calls config.status.
|
||
@@ -7640,7 +7688,7 @@
|
||
exec 5>>config.log
|
||
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
||
# would make configure fail if this is the last instruction.
|
||
- $ac_cs_success || as_fn_exit $?
|
||
+ $ac_cs_success || as_fn_exit 1
|
||
fi
|
||
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
||
diff --git a/src/common/dwarf_cfi_to_module.cc b/src/common/dwarf_cfi_to_module.cc
|
||
--- a/src/common/dwarf_cfi_to_module.cc
|
||
+++ b/src/common/dwarf_cfi_to_module.cc
|
||
@@ -127,7 +127,8 @@
|
||
// address on entry to the function. So establish an initial .ra
|
||
// rule citing the return address register.
|
||
if (return_address_ < register_names_.size())
|
||
- entry_->initial_rules[ra_name_] = register_names_[return_address_];
|
||
+ entry_->initial_rules[ra_name_]
|
||
+ = Module::Expr(register_names_[return_address_], 0, false);
|
||
|
||
return true;
|
||
}
|
||
@@ -153,23 +154,15 @@
|
||
}
|
||
|
||
void DwarfCFIToModule::Record(Module::Address address, int reg,
|
||
- const string &rule) {
|
||
+ const Module::Expr &rule) {
|
||
assert(entry_);
|
||
|
||
- // Place the name in our global set of strings, and then use the string
|
||
- // from the set. Even though the assignment looks like a copy, all the
|
||
- // major std::string implementations use reference counting internally,
|
||
- // so the effect is to have all our data structures share copies of rules
|
||
- // whenever possible. Since register names are drawn from a
|
||
- // vector<string>, register names are already shared.
|
||
- string shared_rule = *common_strings_.insert(rule).first;
|
||
-
|
||
// Is this one of this entry's initial rules?
|
||
if (address == entry_->address)
|
||
- entry_->initial_rules[RegisterName(reg)] = shared_rule;
|
||
+ entry_->initial_rules[RegisterName(reg)] = rule;
|
||
// File it under the appropriate address.
|
||
else
|
||
- entry_->rule_changes[address][RegisterName(reg)] = shared_rule;
|
||
+ entry_->rule_changes[address][RegisterName(reg)] = rule;
|
||
}
|
||
|
||
bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) {
|
||
@@ -179,33 +172,37 @@
|
||
}
|
||
|
||
bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) {
|
||
- ostringstream s;
|
||
- s << RegisterName(reg);
|
||
- Record(address, reg, s.str());
|
||
+ // reg + 0
|
||
+ Module::Expr rule
|
||
+ = Module::Expr(RegisterName(reg), 0, false);
|
||
+ Record(address, reg, rule);
|
||
return true;
|
||
}
|
||
|
||
bool DwarfCFIToModule::OffsetRule(uint64 address, int reg,
|
||
int base_register, long offset) {
|
||
- ostringstream s;
|
||
- s << RegisterName(base_register) << " " << offset << " + ^";
|
||
- Record(address, reg, s.str());
|
||
+ // *(base_register + offset)
|
||
+ Module::Expr rule
|
||
+ = Module::Expr(RegisterName(base_register), offset, true);
|
||
+ Record(address, reg, rule);
|
||
return true;
|
||
}
|
||
|
||
bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg,
|
||
int base_register, long offset) {
|
||
- ostringstream s;
|
||
- s << RegisterName(base_register) << " " << offset << " +";
|
||
- Record(address, reg, s.str());
|
||
+ // base_register + offset
|
||
+ Module::Expr rule
|
||
+ = Module::Expr(RegisterName(base_register), offset, false);
|
||
+ Record(address, reg, rule);
|
||
return true;
|
||
}
|
||
|
||
bool DwarfCFIToModule::RegisterRule(uint64 address, int reg,
|
||
int base_register) {
|
||
- ostringstream s;
|
||
- s << RegisterName(base_register);
|
||
- Record(address, reg, s.str());
|
||
+ // base_register + 0
|
||
+ Module::Expr rule
|
||
+ = Module::Expr(RegisterName(base_register), 0, false);
|
||
+ Record(address, reg, rule);
|
||
return true;
|
||
}
|
||
|
||
diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h
|
||
--- a/src/common/dwarf_cfi_to_module.h
|
||
+++ b/src/common/dwarf_cfi_to_module.h
|
||
@@ -152,7 +152,7 @@
|
||
string RegisterName(int i);
|
||
|
||
// Record RULE for register REG at ADDRESS.
|
||
- void Record(Module::Address address, int reg, const string &rule);
|
||
+ void Record(Module::Address address, int reg, const Module::Expr &rule);
|
||
|
||
// The module to which we should add entries.
|
||
Module *module_;
|
||
diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc
|
||
--- a/src/common/dwarf_cfi_to_module_unittest.cc
|
||
+++ b/src/common/dwarf_cfi_to_module_unittest.cc
|
||
@@ -158,7 +158,7 @@
|
||
ASSERT_TRUE(handler.End());
|
||
CheckEntry();
|
||
Module::RuleMap expected_initial;
|
||
- expected_initial["reg6"] = "reg6";
|
||
+ expected_initial["reg6"] = Module::Expr("reg6", 0, false);
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
|
||
EXPECT_EQ(0U, entries[0]->rule_changes.size());
|
||
}
|
||
@@ -172,7 +172,8 @@
|
||
CheckEntry();
|
||
EXPECT_EQ(0U, entries[0]->initial_rules.size());
|
||
Module::RuleChangeMap expected_changes;
|
||
- expected_changes[entry_address + 1][".ra"] = ".cfa 16927065 + ^";
|
||
+ expected_changes[entry_address + 1][".ra"] =
|
||
+ Module::Expr(".cfa", 16927065, true);
|
||
EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
|
||
}
|
||
|
||
@@ -184,7 +185,8 @@
|
||
CheckEntry();
|
||
EXPECT_EQ(0U, entries[0]->initial_rules.size());
|
||
Module::RuleChangeMap expected_changes;
|
||
- expected_changes[entry_address + 1][".cfa"] = "reg4 -34530721 + ^";
|
||
+ expected_changes[entry_address + 1][".cfa"] =
|
||
+ Module::Expr("reg4", -34530721, true);
|
||
EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
|
||
}
|
||
|
||
@@ -200,7 +202,7 @@
|
||
EXPECT_EQ(0U, entries[0]->initial_rules.size());
|
||
Module::RuleChangeMap expected_changes;
|
||
expected_changes[entry_address + 0x5ab7][".cfa"] =
|
||
- "unnamed_register11 61812979 +";
|
||
+ Module::Expr("unnamed_register11", 61812979, false);
|
||
EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
|
||
}
|
||
|
||
@@ -210,7 +212,7 @@
|
||
ASSERT_TRUE(handler.End());
|
||
CheckEntry();
|
||
Module::RuleMap expected_initial;
|
||
- expected_initial[".ra"] = "reg3";
|
||
+ expected_initial[".ra"] = Module::Expr("reg3", 0, false);
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
|
||
EXPECT_EQ(0U, entries[0]->rule_changes.size());
|
||
}
|
||
@@ -244,8 +246,8 @@
|
||
ASSERT_TRUE(handler.End());
|
||
CheckEntry();
|
||
Module::RuleMap expected_initial;
|
||
- expected_initial[".ra"] = "reg2";
|
||
- expected_initial["reg0"] = "reg1";
|
||
+ expected_initial[".ra"] = Module::Expr("reg2", 0, false);
|
||
+ expected_initial["reg0"] = Module::Expr("reg1", 0, false);
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
|
||
EXPECT_EQ(0U, entries[0]->rule_changes.size());
|
||
}
|
||
@@ -257,7 +259,7 @@
|
||
ASSERT_TRUE(handler.End());
|
||
CheckEntry();
|
||
Module::RuleMap expected_initial;
|
||
- expected_initial[".ra"] = "reg1";
|
||
+ expected_initial[".ra"] = Module::Expr("reg1", 0, false);
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
|
||
EXPECT_EQ(0U, entries[0]->rule_changes.size());
|
||
}
|
||
@@ -269,10 +271,11 @@
|
||
ASSERT_TRUE(handler.End());
|
||
CheckEntry();
|
||
Module::RuleMap expected_initial;
|
||
- expected_initial[".ra"] = "reg2";
|
||
+ expected_initial[".ra"] = Module::Expr("reg2", 0, false);
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
|
||
Module::RuleChangeMap expected_changes;
|
||
- expected_changes[entry_address + 1][".ra"] = "reg1";
|
||
+ expected_changes[entry_address + 1][".ra"] =
|
||
+ Module::Expr("reg1", 0, false);
|
||
EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
|
||
}
|
||
|
||
diff --git a/src/common/module.cc b/src/common/module.cc
|
||
--- a/src/common/module.cc
|
||
+++ b/src/common/module.cc
|
||
@@ -256,6 +256,24 @@
|
||
return false;
|
||
}
|
||
|
||
+std::ostream& operator<<(std::ostream& stream, const Module::Expr& expr) {
|
||
+ assert(!expr.invalid());
|
||
+ switch (expr.how_) {
|
||
+ case Module::kExprSimple:
|
||
+ stream << expr.ident_ << " " << expr.offset_ << " +";
|
||
+ break;
|
||
+ case Module::kExprSimpleMem:
|
||
+ stream << expr.ident_ << " " << expr.offset_ << " + ^";
|
||
+ break;
|
||
+ case Module::kExprPostfix:
|
||
+ stream << expr.postfix_; break;
|
||
+ case Module::kExprInvalid:
|
||
+ default:
|
||
+ break;
|
||
+ }
|
||
+ return stream;
|
||
+}
|
||
+
|
||
bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) {
|
||
for (RuleMap::const_iterator it = rule_map.begin();
|
||
it != rule_map.end(); ++it) {
|
||
diff --git a/src/common/module.h b/src/common/module.h
|
||
--- a/src/common/module.h
|
||
+++ b/src/common/module.h
|
||
@@ -124,11 +124,71 @@
|
||
string name;
|
||
};
|
||
|
||
- // A map from register names to postfix expressions that recover
|
||
- // their their values. This can represent a complete set of rules to
|
||
+ // Representation of an expression. This can either be a postfix
|
||
+ // expression, in which case it is stored as a string, or a simple
|
||
+ // expression of the form (identifier + imm) or *(identifier + imm).
|
||
+ // It can also be invalid (denoting "no value").
|
||
+ enum ExprHow {
|
||
+ kExprInvalid = 1,
|
||
+ kExprPostfix,
|
||
+ kExprSimple,
|
||
+ kExprSimpleMem
|
||
+ };
|
||
+ struct Expr {
|
||
+ // Construct a simple-form expression
|
||
+ Expr(string ident, long offset, bool deref) {
|
||
+ if (ident.empty()) {
|
||
+ Expr();
|
||
+ } else {
|
||
+ postfix_ = "";
|
||
+ ident_ = ident;
|
||
+ offset_ = offset;
|
||
+ how_ = deref ? kExprSimpleMem : kExprSimple;
|
||
+ }
|
||
+ }
|
||
+ // Construct an expression from a postfix string
|
||
+ Expr(string postfix) {
|
||
+ if (postfix.empty()) {
|
||
+ Expr();
|
||
+ } else {
|
||
+ postfix_ = postfix;
|
||
+ ident_ = "";
|
||
+ offset_ = 0;
|
||
+ how_ = kExprPostfix;
|
||
+ }
|
||
+ }
|
||
+ // Construct an invalid expression
|
||
+ Expr() {
|
||
+ postfix_ = "";
|
||
+ ident_ = "";
|
||
+ offset_ = 0;
|
||
+ how_ = kExprInvalid;
|
||
+ }
|
||
+ bool invalid() const { return how_ == kExprInvalid; }
|
||
+ bool operator==(const Expr& other) const {
|
||
+ return how_ == other.how_ &&
|
||
+ ident_ == other.ident_ &&
|
||
+ offset_ == other.offset_ &&
|
||
+ postfix_ == other.postfix_;
|
||
+ }
|
||
+
|
||
+ // The identifier that gives the starting value for simple expressions.
|
||
+ string ident_;
|
||
+ // The offset to add for simple expressions.
|
||
+ long offset_;
|
||
+ // The Postfix expression string to evaluate for non-simple expressions.
|
||
+ string postfix_;
|
||
+ // The operation expressed by this expression.
|
||
+ ExprHow how_;
|
||
+
|
||
+ friend std::ostream& operator<<(std::ostream& stream, const Expr& expr);
|
||
+ };
|
||
+
|
||
+ // A map from register names to expressions that recover
|
||
+ // their values. This can represent a complete set of rules to
|
||
// follow at some address, or a set of changes to be applied to an
|
||
// extant set of rules.
|
||
- typedef map<string, string> RuleMap;
|
||
+ typedef map<string, Expr> RuleMap;
|
||
|
||
// A map from addresses to RuleMaps, representing changes that take
|
||
// effect at given addresses.
|
||
diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc
|
||
--- a/src/common/module_unittest.cc
|
||
+++ b/src/common/module_unittest.cc
|
||
@@ -130,11 +130,11 @@
|
||
Module::StackFrameEntry *entry = new Module::StackFrameEntry();
|
||
entry->address = 0x30f9e5c83323973dULL;
|
||
entry->size = 0x49fc9ca7c7c13dc2ULL;
|
||
- entry->initial_rules[".cfa"] = "he was a handsome man";
|
||
- entry->initial_rules["and"] = "what i want to know is";
|
||
+ entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
|
||
+ entry->initial_rules["and"] = Module::Expr("what i want to know is");
|
||
entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
|
||
- "do you like your blueeyed boy";
|
||
- entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
|
||
+ Module::Expr("do you like your blueeyed boy");
|
||
+ entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
|
||
m.AddStackFrameEntry(entry);
|
||
|
||
// Set the load address. Doing this after adding all the data to
|
||
@@ -234,11 +234,11 @@
|
||
Module::StackFrameEntry *entry = new Module::StackFrameEntry();
|
||
entry->address = 0x30f9e5c83323973dULL;
|
||
entry->size = 0x49fc9ca7c7c13dc2ULL;
|
||
- entry->initial_rules[".cfa"] = "he was a handsome man";
|
||
- entry->initial_rules["and"] = "what i want to know is";
|
||
+ entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
|
||
+ entry->initial_rules["and"] = Module::Expr("what i want to know is");
|
||
entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
|
||
- "do you like your blueeyed boy";
|
||
- entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
|
||
+ Module::Expr("do you like your blueeyed boy");
|
||
+ entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
|
||
m.AddStackFrameEntry(entry);
|
||
|
||
// Set the load address. Doing this after adding all the data to
|
||
@@ -310,24 +310,24 @@
|
||
Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
|
||
entry2->address = 0x8064f3af5e067e38ULL;
|
||
entry2->size = 0x0de2a5ee55509407ULL;
|
||
- entry2->initial_rules[".cfa"] = "I think that I shall never see";
|
||
- entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
|
||
- entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
|
||
+ entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
|
||
+ entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
|
||
+ entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
|
||
m.AddStackFrameEntry(entry2);
|
||
|
||
// Third STACK CFI entry, with initial rules and deltas.
|
||
Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
|
||
entry3->address = 0x5e8d0db0a7075c6cULL;
|
||
entry3->size = 0x1c7edb12a7aea229ULL;
|
||
- entry3->initial_rules[".cfa"] = "Whose woods are these";
|
||
+ entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
|
||
entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
|
||
- "the village though";
|
||
+ Module::Expr("the village though");
|
||
entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
|
||
- "he will not see me stopping here";
|
||
+ Module::Expr("he will not see me stopping here");
|
||
entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
|
||
- "his house is in";
|
||
+ Module::Expr("his house is in");
|
||
entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
|
||
- "I think I know";
|
||
+ Module::Expr("I think I know");
|
||
m.AddStackFrameEntry(entry3);
|
||
|
||
// Check that Write writes STACK CFI records properly.
|
||
@@ -357,23 +357,23 @@
|
||
EXPECT_EQ(0x5e8d0db0a7075c6cULL, entries[0]->address);
|
||
EXPECT_EQ(0x1c7edb12a7aea229ULL, entries[0]->size);
|
||
Module::RuleMap entry1_initial;
|
||
- entry1_initial[".cfa"] = "Whose woods are these";
|
||
+ entry1_initial[".cfa"] = Module::Expr("Whose woods are these");
|
||
EXPECT_THAT(entries[0]->initial_rules, ContainerEq(entry1_initial));
|
||
Module::RuleChangeMap entry1_changes;
|
||
- entry1_changes[0x36682fad3763ffffULL][".cfa"] = "I think I know";
|
||
- entry1_changes[0x36682fad3763ffffULL]["stromboli"] = "his house is in";
|
||
- entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = "the village though";
|
||
+ entry1_changes[0x36682fad3763ffffULL][".cfa"] = Module::Expr("I think I know");
|
||
+ entry1_changes[0x36682fad3763ffffULL]["stromboli"] = Module::Expr("his house is in");
|
||
+ entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = Module::Expr("the village though");
|
||
entry1_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
|
||
- "he will not see me stopping here";
|
||
+ Module::Expr("he will not see me stopping here");
|
||
EXPECT_THAT(entries[0]->rule_changes, ContainerEq(entry1_changes));
|
||
// Check second entry.
|
||
EXPECT_EQ(0x8064f3af5e067e38ULL, entries[1]->address);
|
||
EXPECT_EQ(0x0de2a5ee55509407ULL, entries[1]->size);
|
||
ASSERT_EQ(3U, entries[1]->initial_rules.size());
|
||
Module::RuleMap entry2_initial;
|
||
- entry2_initial[".cfa"] = "I think that I shall never see";
|
||
- entry2_initial["stromboli"] = "a poem lovely as a tree";
|
||
- entry2_initial["cannoli"] = "a tree whose hungry mouth is prest";
|
||
+ entry2_initial[".cfa"] = Module::Expr("I think that I shall never see");
|
||
+ entry2_initial["stromboli"] = Module::Expr("a poem lovely as a tree");
|
||
+ entry2_initial["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
|
||
EXPECT_THAT(entries[1]->initial_rules, ContainerEq(entry2_initial));
|
||
ASSERT_EQ(0U, entries[1]->rule_changes.size());
|
||
// Check third entry.
|
||
@@ -590,24 +590,24 @@
|
||
Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
|
||
entry2->address = 0x3000;
|
||
entry2->size = 0x900;
|
||
- entry2->initial_rules[".cfa"] = "I think that I shall never see";
|
||
- entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
|
||
- entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
|
||
+ entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
|
||
+ entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
|
||
+ entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
|
||
m.AddStackFrameEntry(entry2);
|
||
|
||
// Third STACK CFI entry, with initial rules and deltas.
|
||
Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
|
||
entry3->address = 0x1000;
|
||
entry3->size = 0x900;
|
||
- entry3->initial_rules[".cfa"] = "Whose woods are these";
|
||
+ entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
|
||
entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
|
||
- "the village though";
|
||
+ Module::Expr("the village though");
|
||
entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
|
||
- "he will not see me stopping here";
|
||
+ Module::Expr("he will not see me stopping here");
|
||
entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
|
||
- "his house is in";
|
||
+ Module::Expr("his house is in");
|
||
entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
|
||
- "I think I know";
|
||
+ Module::Expr("I think I know");
|
||
m.AddStackFrameEntry(entry3);
|
||
|
||
Module::StackFrameEntry* s = m.FindStackFrameEntryByAddress(0x1000);
|
||
diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
|
||
--- a/src/processor/cfi_frame_info.cc
|
||
+++ b/src/processor/cfi_frame_info.cc
|
||
@@ -49,7 +49,7 @@
|
||
RegisterValueMap<V> *caller_registers) const {
|
||
// If there are not rules for both .ra and .cfa in effect at this address,
|
||
// don't use this CFI data for stack walking.
|
||
- if (cfa_rule_.empty() || ra_rule_.empty())
|
||
+ if (cfa_rule_.invalid() || ra_rule_.invalid())
|
||
return false;
|
||
|
||
RegisterValueMap<V> working;
|
||
@@ -100,10 +100,10 @@
|
||
string CFIFrameInfo::Serialize() const {
|
||
std::ostringstream stream;
|
||
|
||
- if (!cfa_rule_.empty()) {
|
||
+ if (!cfa_rule_.invalid()) {
|
||
stream << ".cfa: " << cfa_rule_;
|
||
}
|
||
- if (!ra_rule_.empty()) {
|
||
+ if (!ra_rule_.invalid()) {
|
||
if (static_cast<std::streamoff>(stream.tellp()) != 0)
|
||
stream << " ";
|
||
stream << ".ra: " << ra_rule_;
|
||
@@ -167,16 +167,17 @@
|
||
}
|
||
|
||
void CFIFrameInfoParseHandler::CFARule(const string &expression) {
|
||
- frame_info_->SetCFARule(expression);
|
||
+ // 'expression' is a postfix expression string.
|
||
+ frame_info_->SetCFARule(Module::Expr(expression));
|
||
}
|
||
|
||
void CFIFrameInfoParseHandler::RARule(const string &expression) {
|
||
- frame_info_->SetRARule(expression);
|
||
+ frame_info_->SetRARule(Module::Expr(expression));
|
||
}
|
||
|
||
void CFIFrameInfoParseHandler::RegisterRule(const string &name,
|
||
const string &expression) {
|
||
- frame_info_->SetRegisterRule(name, expression);
|
||
+ frame_info_->SetRegisterRule(name, Module::Expr(expression));
|
||
}
|
||
|
||
} // namespace google_breakpad
|
||
diff --git a/src/processor/cfi_frame_info.h b/src/processor/cfi_frame_info.h
|
||
--- a/src/processor/cfi_frame_info.h
|
||
+++ b/src/processor/cfi_frame_info.h
|
||
@@ -43,6 +43,7 @@
|
||
|
||
#include "common/using_std_string.h"
|
||
#include "google_breakpad/common/breakpad_types.h"
|
||
+#include "common/module.h"
|
||
|
||
namespace google_breakpad {
|
||
|
||
@@ -66,16 +67,17 @@
|
||
class CFIFrameInfo {
|
||
public:
|
||
// A map from register names onto values.
|
||
- template<typename ValueType> class RegisterValueMap:
|
||
+ template<typename ValueType> class RegisterValueMap:
|
||
public map<string, ValueType> { };
|
||
|
||
// Set the expression for computing a call frame address, return
|
||
// address, or register's value. At least the CFA rule and the RA
|
||
// rule must be set before calling FindCallerRegs.
|
||
- void SetCFARule(const string &expression) { cfa_rule_ = expression; }
|
||
- void SetRARule(const string &expression) { ra_rule_ = expression; }
|
||
- void SetRegisterRule(const string ®ister_name, const string &expression) {
|
||
- register_rules_[register_name] = expression;
|
||
+ void SetCFARule(const Module::Expr& rule) { cfa_rule_ = rule; }
|
||
+ void SetRARule(const Module::Expr& rule) { ra_rule_ = rule; }
|
||
+ void SetRegisterRule(const string& register_name,
|
||
+ const Module::Expr& rule) {
|
||
+ register_rules_[register_name] = rule;
|
||
}
|
||
|
||
// Compute the values of the calling frame's registers, according to
|
||
@@ -106,27 +108,23 @@
|
||
|
||
private:
|
||
|
||
- // A map from register names onto evaluation rules.
|
||
- typedef map<string, string> RuleMap;
|
||
+ // A map from register names onto evaluation rules.
|
||
+ typedef map<string, Module::Expr> RuleMap;
|
||
|
||
- // In this type, a "postfix expression" is an expression of the sort
|
||
- // interpreted by google_breakpad::PostfixEvaluator.
|
||
-
|
||
- // A postfix expression for computing the current frame's CFA (call
|
||
+ // An expression for computing the current frame's CFA (call
|
||
// frame address). The CFA is a reference address for the frame that
|
||
// remains unchanged throughout the frame's lifetime. You should
|
||
// evaluate this expression with a dictionary initially populated
|
||
// with the values of the current frame's known registers.
|
||
- string cfa_rule_;
|
||
+ Module::Expr cfa_rule_;
|
||
|
||
// The following expressions should be evaluated with a dictionary
|
||
// initially populated with the values of the current frame's known
|
||
// registers, and with ".cfa" set to the result of evaluating the
|
||
// cfa_rule expression, above.
|
||
|
||
- // A postfix expression for computing the current frame's return
|
||
- // address.
|
||
- string ra_rule_;
|
||
+ // An expression for computing the current frame's return address.
|
||
+ Module::Expr ra_rule_;
|
||
|
||
// For a register named REG, rules[REG] is a postfix expression
|
||
// which leaves the value of REG in the calling frame on the top of
|
||
diff --git a/src/processor/cfi_frame_info_unittest.cc b/src/processor/cfi_frame_info_unittest.cc
|
||
--- a/src/processor/cfi_frame_info_unittest.cc
|
||
+++ b/src/processor/cfi_frame_info_unittest.cc
|
||
@@ -35,6 +35,7 @@
|
||
#include <string.h>
|
||
|
||
#include "breakpad_googletest_includes.h"
|
||
+#include "common/module.h"
|
||
#include "common/using_std_string.h"
|
||
#include "processor/cfi_frame_info.h"
|
||
#include "google_breakpad/processor/memory_region.h"
|
||
@@ -43,6 +44,7 @@
|
||
using google_breakpad::CFIFrameInfoParseHandler;
|
||
using google_breakpad::CFIRuleParser;
|
||
using google_breakpad::MemoryRegion;
|
||
+using google_breakpad::Module;
|
||
using google_breakpad::SimpleCFIWalker;
|
||
using testing::_;
|
||
using testing::A;
|
||
@@ -86,7 +88,7 @@
|
||
TEST_F(Simple, NoCFA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetRARule("0");
|
||
+ cfi.SetRARule(Module::Expr("0"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(".ra: 0", cfi.Serialize());
|
||
@@ -96,7 +98,7 @@
|
||
TEST_F(Simple, NoRA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("0");
|
||
+ cfi.SetCFARule(Module::Expr("0"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(".cfa: 0", cfi.Serialize());
|
||
@@ -105,8 +107,8 @@
|
||
TEST_F(Simple, SetCFAAndRARule) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("330903416631436410");
|
||
- cfi.SetRARule("5870666104170902211");
|
||
+ cfi.SetCFARule(Module::Expr("330903416631436410"));
|
||
+ cfi.SetRARule(Module::Expr("5870666104170902211"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(2U, caller_registers.size());
|
||
@@ -120,12 +122,12 @@
|
||
TEST_F(Simple, SetManyRules) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -");
|
||
- cfi.SetRARule(".cfa 99804755 +");
|
||
- cfi.SetRegisterRule("register1", ".cfa 54370437 *");
|
||
- cfi.SetRegisterRule("vodkathumbscrewingly", "24076308 .cfa +");
|
||
- cfi.SetRegisterRule("pubvexingfjordschmaltzy", ".cfa 29801007 -");
|
||
- cfi.SetRegisterRule("uncopyrightables", "92642917 .cfa /");
|
||
+ cfi.SetCFARule(Module::Expr("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -"));
|
||
+ cfi.SetRARule(Module::Expr(".cfa 99804755 +"));
|
||
+ cfi.SetRegisterRule("register1", Module::Expr(".cfa 54370437 *"));
|
||
+ cfi.SetRegisterRule("vodkathumbscrewingly", Module::Expr("24076308 .cfa +"));
|
||
+ cfi.SetRegisterRule("pubvexingfjordschmaltzy", Module::Expr(".cfa 29801007 -"));
|
||
+ cfi.SetRegisterRule("uncopyrightables", Module::Expr("92642917 .cfa /"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(6U, caller_registers.size());
|
||
@@ -147,9 +149,9 @@
|
||
TEST_F(Simple, RulesOverride) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("330903416631436410");
|
||
- cfi.SetRARule("5870666104170902211");
|
||
- cfi.SetCFARule("2828089117179001");
|
||
+ cfi.SetCFARule(Module::Expr("330903416631436410"));
|
||
+ cfi.SetRARule(Module::Expr("5870666104170902211"));
|
||
+ cfi.SetCFARule(Module::Expr("2828089117179001"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(2U, caller_registers.size());
|
||
@@ -165,8 +167,8 @@
|
||
TEST_F(Scope, CFALacksCFA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule(".cfa");
|
||
- cfi.SetRARule("0");
|
||
+ cfi.SetCFARule(Module::Expr(".cfa"));
|
||
+ cfi.SetRARule(Module::Expr("0"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
}
|
||
@@ -175,8 +177,8 @@
|
||
TEST_F(Scope, CFALacksRA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule(".ra");
|
||
- cfi.SetRARule("0");
|
||
+ cfi.SetCFARule(Module::Expr(".ra"));
|
||
+ cfi.SetRARule(Module::Expr("0"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
}
|
||
@@ -188,8 +190,8 @@
|
||
|
||
registers[".baraminology"] = 0x06a7bc63e4f13893ULL;
|
||
registers[".ornithorhynchus"] = 0x5e0bf850bafce9d2ULL;
|
||
- cfi.SetCFARule(".baraminology .ornithorhynchus +");
|
||
- cfi.SetRARule("0");
|
||
+ cfi.SetCFARule(Module::Expr(".baraminology .ornithorhynchus +"));
|
||
+ cfi.SetRARule(Module::Expr("0"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(2U, caller_registers.size());
|
||
@@ -201,8 +203,8 @@
|
||
TEST_F(Scope, RASeesCFA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("48364076");
|
||
- cfi.SetRARule(".cfa");
|
||
+ cfi.SetCFARule(Module::Expr("48364076"));
|
||
+ cfi.SetRARule(Module::Expr(".cfa"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(2U, caller_registers.size());
|
||
@@ -213,8 +215,8 @@
|
||
TEST_F(Scope, RALacksRA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("0");
|
||
- cfi.SetRARule(".ra");
|
||
+ cfi.SetCFARule(Module::Expr("0"));
|
||
+ cfi.SetRARule(Module::Expr(".ra"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
}
|
||
@@ -225,8 +227,8 @@
|
||
ExpectNoMemoryReferences();
|
||
|
||
registers["noachian"] = 0x54dc4a5d8e5eb503ULL;
|
||
- cfi.SetCFARule("10359370");
|
||
- cfi.SetRARule("noachian");
|
||
+ cfi.SetCFARule(Module::Expr("10359370"));
|
||
+ cfi.SetRARule(Module::Expr("noachian"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(2U, caller_registers.size());
|
||
@@ -237,9 +239,9 @@
|
||
TEST_F(Scope, RegistersSeeCFA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("6515179");
|
||
- cfi.SetRARule(".cfa");
|
||
- cfi.SetRegisterRule("rogerian", ".cfa");
|
||
+ cfi.SetCFARule(Module::Expr("6515179"));
|
||
+ cfi.SetRARule(Module::Expr(".cfa"));
|
||
+ cfi.SetRegisterRule("rogerian", Module::Expr(".cfa"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(3U, caller_registers.size());
|
||
@@ -250,9 +252,9 @@
|
||
TEST_F(Scope, RegsLackRA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("42740329");
|
||
- cfi.SetRARule("27045204");
|
||
- cfi.SetRegisterRule("$r1", ".ra");
|
||
+ cfi.SetCFARule(Module::Expr("42740329"));
|
||
+ cfi.SetRARule(Module::Expr("27045204"));
|
||
+ cfi.SetRegisterRule("$r1", Module::Expr(".ra"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
}
|
||
@@ -263,10 +265,10 @@
|
||
|
||
registers["$r1"] = 0x6ed3582c4bedb9adULL;
|
||
registers["$r2"] = 0xd27d9e742b8df6d0ULL;
|
||
- cfi.SetCFARule("88239303");
|
||
- cfi.SetRARule("30503835");
|
||
- cfi.SetRegisterRule("$r1", "$r1 42175211 = $r2");
|
||
- cfi.SetRegisterRule("$r2", "$r2 21357221 = $r1");
|
||
+ cfi.SetCFARule(Module::Expr("88239303"));
|
||
+ cfi.SetRARule(Module::Expr("30503835"));
|
||
+ cfi.SetRegisterRule("$r1", Module::Expr("$r1 42175211 = $r2"));
|
||
+ cfi.SetRegisterRule("$r2", Module::Expr("$r2 21357221 = $r1"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
ASSERT_EQ(4U, caller_registers.size());
|
||
@@ -278,13 +280,13 @@
|
||
TEST_F(Scope, SeparateTempsRA) {
|
||
ExpectNoMemoryReferences();
|
||
|
||
- cfi.SetCFARule("$temp1 76569129 = $temp1");
|
||
- cfi.SetRARule("0");
|
||
+ cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
|
||
+ cfi.SetRARule(Module::Expr("0"));
|
||
ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
|
||
- cfi.SetCFARule("$temp1 76569129 = $temp1");
|
||
- cfi.SetRARule("$temp1");
|
||
+ cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
|
||
+ cfi.SetRARule(Module::Expr("$temp1"));
|
||
ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
|
||
&caller_registers));
|
||
}
|
||
@@ -517,10 +519,10 @@
|
||
.WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL),
|
||
Return(true)));
|
||
|
||
- call_frame_info.SetCFARule("sp 24 +");
|
||
- call_frame_info.SetRARule(".cfa 8 - ^");
|
||
- call_frame_info.SetRegisterRule("r0", ".cfa 24 - ^");
|
||
- call_frame_info.SetRegisterRule("r1", "r2");
|
||
+ call_frame_info.SetCFARule(Module::Expr("sp 24 +"));
|
||
+ call_frame_info.SetRARule(Module::Expr(".cfa 8 - ^"));
|
||
+ call_frame_info.SetRegisterRule("r0", Module::Expr(".cfa 24 - ^"));
|
||
+ call_frame_info.SetRegisterRule("r1", Module::Expr("r2"));
|
||
|
||
callee_context.r0 = 0x94e030ca79edd119ULL;
|
||
callee_context.r1 = 0x937b4d7e95ce52d9ULL;
|
||
diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
|
||
--- a/src/processor/postfix_evaluator-inl.h
|
||
+++ b/src/processor/postfix_evaluator-inl.h
|
||
@@ -231,12 +231,19 @@
|
||
}
|
||
|
||
template<typename ValueType>
|
||
-bool PostfixEvaluator<ValueType>::Evaluate(const string &expression,
|
||
- DictionaryValidityType *assigned) {
|
||
+bool PostfixEvaluator<ValueType>::Evaluate(const Module::Expr& expr,
|
||
+ DictionaryValidityType* assigned) {
|
||
+ // The expression is being exevaluated only for its side effects. Skip
|
||
+ // expressions that denote values only.
|
||
+ if (expr.how_ != Module::kExprPostfix) {
|
||
+ BPLOG(ERROR) << "Can't evaluate for side-effects: " << expr;
|
||
+ return false;
|
||
+ }
|
||
+
|
||
// Ensure that the stack is cleared before returning.
|
||
AutoStackClearer clearer(&stack_);
|
||
|
||
- if (!EvaluateInternal(expression, assigned))
|
||
+ if (!EvaluateInternal(expr.postfix_, assigned))
|
||
return false;
|
||
|
||
// If there's anything left on the stack, it indicates incomplete execution.
|
||
@@ -245,28 +252,69 @@
|
||
if (stack_.empty())
|
||
return true;
|
||
|
||
- BPLOG(ERROR) << "Incomplete execution: " << expression;
|
||
+ BPLOG(ERROR) << "Incomplete execution: " << expr;
|
||
return false;
|
||
}
|
||
|
||
template<typename ValueType>
|
||
-bool PostfixEvaluator<ValueType>::EvaluateForValue(const string &expression,
|
||
- ValueType *result) {
|
||
- // Ensure that the stack is cleared before returning.
|
||
- AutoStackClearer clearer(&stack_);
|
||
+bool PostfixEvaluator<ValueType>::EvaluateForValue(const Module::Expr& expr,
|
||
+ ValueType* result) {
|
||
+ switch (expr.how_) {
|
||
|
||
- if (!EvaluateInternal(expression, NULL))
|
||
- return false;
|
||
+ // Postfix expression. Give to the evaluator and return the
|
||
+ // one-and-only stack element that should be left over.
|
||
+ case Module::kExprPostfix: {
|
||
+ // Ensure that the stack is cleared before returning.
|
||
+ AutoStackClearer clearer(&stack_);
|
||
|
||
- // A successful execution should leave exactly one value on the stack.
|
||
- if (stack_.size() != 1) {
|
||
- BPLOG(ERROR) << "Expression yielded bad number of results: "
|
||
- << "'" << expression << "'";
|
||
- return false;
|
||
+ if (!EvaluateInternal(expr.postfix_, NULL))
|
||
+ return false;
|
||
+
|
||
+ // A successful execution should leave exactly one value on the stack.
|
||
+ if (stack_.size() != 1) {
|
||
+ BPLOG(ERROR) << "Expression yielded bad number of results: "
|
||
+ << "'" << expr << "'";
|
||
+ return false;
|
||
+ }
|
||
+
|
||
+ return PopValue(result);
|
||
+ }
|
||
+
|
||
+ // Simple-form expressions
|
||
+ case Module::kExprSimple:
|
||
+ case Module::kExprSimpleMem: {
|
||
+ // Look up the base value
|
||
+ typename DictionaryType::const_iterator iterator
|
||
+ = dictionary_->find(expr.ident_);
|
||
+ if (iterator == dictionary_->end()) {
|
||
+ // The identifier wasn't found in the dictionary. Don't imply any
|
||
+ // default value, just fail.
|
||
+ BPLOG(INFO) << "Identifier " << expr.ident_
|
||
+ << " not in dictionary (kExprSimple{Mem})";
|
||
+ return false;
|
||
+ }
|
||
+
|
||
+ // Form the sum
|
||
+ ValueType sum = iterator->second + (int64_t)expr.offset_;
|
||
+
|
||
+ // and dereference if necessary
|
||
+ if (expr.how_ == Module::kExprSimpleMem) {
|
||
+ ValueType derefd;
|
||
+ if (!memory_ || !memory_->GetMemoryAtAddress(sum, &derefd)) {
|
||
+ return false;
|
||
+ }
|
||
+ *result = derefd;
|
||
+ } else {
|
||
+ *result = sum;
|
||
+ }
|
||
+ return true;
|
||
+ }
|
||
+
|
||
+ default:
|
||
+ return false;
|
||
}
|
||
+}
|
||
|
||
- return PopValue(result);
|
||
-}
|
||
|
||
template<typename ValueType>
|
||
typename PostfixEvaluator<ValueType>::PopResult
|
||
diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h
|
||
--- a/src/processor/postfix_evaluator.h
|
||
+++ b/src/processor/postfix_evaluator.h
|
||
@@ -75,6 +75,7 @@
|
||
#include <vector>
|
||
|
||
#include "common/using_std_string.h"
|
||
+#include "common/module.h"
|
||
|
||
namespace google_breakpad {
|
||
|
||
@@ -105,13 +106,13 @@
|
||
// non-NULL, any keys set in the dictionary as a result of evaluation
|
||
// will also be set to true in assigned, providing a way to determine if
|
||
// an expression modifies any of its input variables.
|
||
- bool Evaluate(const string &expression, DictionaryValidityType *assigned);
|
||
+ bool Evaluate(const Module::Expr &expr, DictionaryValidityType *assigned);
|
||
|
||
- // Like Evaluate, but provides the value left on the stack to the
|
||
- // caller. If evaluation succeeds and leaves exactly one value on
|
||
- // the stack, pop that value, store it in *result, and return true.
|
||
- // Otherwise, return false.
|
||
- bool EvaluateForValue(const string &expression, ValueType *result);
|
||
+ // Like Evaluate, but expects the expression to denote a value.
|
||
+ // If evaluation succeeds and (in the case of a postfix expression)
|
||
+ // leaves exactly one value on the stack, pop that value, store it in
|
||
+ // *result, and return true. Otherwise, return false.
|
||
+ bool EvaluateForValue(const Module::Expr& expression, ValueType* result);
|
||
|
||
DictionaryType* dictionary() const { return dictionary_; }
|
||
|