diff --git a/Makefile.am b/Makefile.am
index 9b7f7247..688725fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,7 +193,6 @@ check_PROGRAMS += \
 	src/processor/basic_source_line_resolver_unittest \
 	src/processor/cfi_frame_info_unittest \
 	src/processor/contained_range_map_unittest \
-	src/processor/disassembler_objdump_unittest \
 	src/processor/disassembler_x86_unittest \
 	src/processor/exploitability_unittest \
 	src/processor/fast_source_line_resolver_unittest \
@@ -221,6 +220,10 @@ check_PROGRAMS += \
 	src/processor/stackwalker_riscv64_unittest \
 	src/processor/stackwalker_x86_unittest \
 	src/processor/synth_minidump_unittest
+if LINUX_HOST
+check_PROGRAMS += \
+	src/processor/disassembler_objdump_unittest
+endif LINUX_HOST
 if SELFTEST
 check_PROGRAMS += \
 	src/processor/stackwalker_selftest
@@ -366,8 +369,6 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/contained_range_map.h \
 	src/processor/convert_old_arm64_context.cc \
 	src/processor/convert_old_arm64_context.h \
-	src/processor/disassembler_objdump.h \
-	src/processor/disassembler_objdump.cc \
 	src/processor/disassembler_x86.h \
 	src/processor/disassembler_x86.cc \
 	src/processor/dump_context.cc \
@@ -449,6 +450,11 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/symbolic_constants_win.h \
 	src/processor/tokenize.cc \
 	src/processor/tokenize.h
+if LINUX_HOST
+src_libbreakpad_a_SOURCES += \
+	src/processor/disassembler_objdump.cc \
+	src/processor/disassembler_objdump.h
+endif LINUX_HOST
 
 # libdisasm 3rd party library
 src_third_party_libdisasm_libdisasm_a_SOURCES = \
@@ -911,7 +917,6 @@ src_processor_exploitability_unittest_LDADD = \
 	src/processor/convert_old_arm64_context.o \
 	src/processor/minidump_processor.o \
 	src/processor/process_state.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
@@ -947,6 +952,10 @@ src_processor_exploitability_unittest_LDADD = \
 	src/third_party/libdisasm/libdisasm.a \
 	$(TEST_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+if LINUX_HOST
+src_processor_exploitability_unittest_LDADD += \
+	src/processor/disassembler_objdump.o
+endif
 
 src_processor_disassembler_objdump_unittest_SOURCES = \
 	src/processor/disassembler_objdump_unittest.cc
@@ -1044,7 +1053,6 @@ src_processor_minidump_processor_unittest_LDADD = \
 	src/processor/call_stack.o \
 	src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o \
 	src/processor/dump_context.o \
 	src/processor/dump_object.o \
@@ -1077,6 +1085,10 @@ src_processor_minidump_processor_unittest_LDADD = \
 	src/third_party/libdisasm/libdisasm.a \
 	$(TEST_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+if LINUX_HOST
+src_processor_minidump_processor_unittest_LDADD += \
+	src/processor/disassembler_objdump.o
+endif
 
 src_processor_minidump_unittest_SOURCES = \
 	src/common/test_assembler.cc \
@@ -1194,7 +1206,6 @@ src_processor_stackwalker_selftest_LDADD = \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
 	src/processor/call_stack.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
@@ -1220,6 +1231,10 @@ src_processor_stackwalker_selftest_LDADD = \
 	src/processor/stackwalker_x86.o \
 	src/processor/tokenize.o \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+if LINUX_HOST
+src_processor_stackwalker_selftest_LDADD += \
+	src/processor/disassembler_objdump.o
+endif
 
 src_processor_stackwalker_amd64_unittest_SOURCES = \
 	src/common/test_assembler.cc \
@@ -1416,7 +1431,6 @@ src_processor_minidump_stackwalk_LDADD = \
 	src/processor/call_stack.o \
 	src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o \
 	src/processor/dump_context.o \
 	src/processor/dump_object.o \
@@ -1449,6 +1463,10 @@ src_processor_minidump_stackwalk_LDADD = \
 	src/processor/symbolic_constants_win.o \
 	src/processor/tokenize.o \
 	src/third_party/libdisasm/libdisasm.a
+if LINUX_HOST
+src_processor_minidump_stackwalk_LDADD += \
+	src/processor/disassembler_objdump.o
+endif LINUX_HOST
 
 ## Additional files to be included in a source distribution
 ##
diff --git a/Makefile.in b/Makefile.in
index d358b6b1..54d8c2aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,11 +131,11 @@ host_triplet = @host@
 # Build as PIC on Linux, for linux_client_unittest_shlib
 @LINUX_HOST_TRUE@am__append_2 = -fPIC
 @LINUX_HOST_TRUE@am__append_3 = -fPIC
-libexec_PROGRAMS = $(am__EXEEXT_10)
+libexec_PROGRAMS = $(am__EXEEXT_11)
 bin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
 check_PROGRAMS = src/common/safe_math_unittest$(EXEEXT) \
 	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
-	$(am__EXEEXT_8) $(am__EXEEXT_9)
+	$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10)
 noinst_PROGRAMS =
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 
@@ -164,7 +164,6 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1)
 @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/contained_range_map_unittest \
-@DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_objdump_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver_unittest \
@@ -193,7 +192,10 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1)
 @DISABLE_PROCESSOR_FALSE@	src/processor/stackwalker_x86_unittest \
 @DISABLE_PROCESSOR_FALSE@	src/processor/synth_minidump_unittest
 
-@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__append_10 = \
+@DISABLE_PROCESSOR_FALSE@@LINUX_HOST_TRUE@am__append_10 = \
+@DISABLE_PROCESSOR_FALSE@@LINUX_HOST_TRUE@	src/processor/disassembler_objdump_unittest
+
+@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__append_11 = \
 @DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@	src/processor/stackwalker_selftest
 
 
@@ -203,17 +205,17 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1)
 # Currently Linux only, the macOS client
 # is built using an Xcode project instead.
 #
-@LINUX_HOST_TRUE@am__append_11 = src/client/linux/libbreakpad_client.a
-@LINUX_HOST_TRUE@am__append_12 = breakpad-client.pc
-@LINUX_HOST_TRUE@am__append_13 = \
+@LINUX_HOST_TRUE@am__append_12 = src/client/linux/libbreakpad_client.a
+@LINUX_HOST_TRUE@am__append_13 = breakpad-client.pc
+@LINUX_HOST_TRUE@am__append_14 = \
 @LINUX_HOST_TRUE@	src/client/linux/linux_client_unittest \
 @LINUX_HOST_TRUE@	src/common/linux/google_crashdump_uploader_test
 
-@LINUX_HOST_TRUE@am__append_14 = \
+@LINUX_HOST_TRUE@am__append_15 = \
 @LINUX_HOST_TRUE@	src/client/linux/linux_dumper_unittest_helper \
 @LINUX_HOST_TRUE@	src/client/linux/linux_client_unittest_shlib
 
-@LINUX_HOST_TRUE@am__append_15 = \
+@LINUX_HOST_TRUE@am__append_16 = \
 @LINUX_HOST_TRUE@	src/client/linux/linux_dumper_unittest_helper \
 @LINUX_HOST_TRUE@	src/client/linux/linux_client_unittest_shlib
 
@@ -222,7 +224,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1)
 # Various Breakpad tools
 # This includes symbol dumpers and uploaders
 #
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_16 = \
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_17 = \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/core2md/core2md \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/pid2md/pid2md \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/dump_syms/dump_syms \
@@ -230,31 +232,47 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1)
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/symupload/minidump_upload \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/symupload/sym_upload
 
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_17 = \
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_18 = \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@	src/tools/mac/dump_syms/dump_syms_mac
 
-@DISABLE_TOOLS_FALSE@@HAVE_MEMFD_CREATE_TRUE@@LINUX_HOST_TRUE@am__append_18 = \
+@DISABLE_TOOLS_FALSE@@HAVE_MEMFD_CREATE_TRUE@@LINUX_HOST_TRUE@am__append_19 = \
 @DISABLE_TOOLS_FALSE@@HAVE_MEMFD_CREATE_TRUE@@LINUX_HOST_TRUE@	src/tools/linux/core_handler/core_handler
 
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_19 = \
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_20 = \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/common/dumper_unittest \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/md2core/minidump_2_core_unittest
 
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_20 = \
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_21 = \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@	src/common/mac/macho_reader_unittest
 
-@HAVE_GETCONTEXT_FALSE@am__append_21 = \
+@LINUX_HOST_TRUE@am__append_22 = \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.cc \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.h
+
+@HAVE_GETCONTEXT_FALSE@am__append_23 = \
 @HAVE_GETCONTEXT_FALSE@	src/common/linux/breakpad_getcontext.S
 
-@HAVE_GETCONTEXT_FALSE@am__append_22 =  \
+@HAVE_GETCONTEXT_FALSE@am__append_24 =  \
 @HAVE_GETCONTEXT_FALSE@	src/common/linux/breakpad_getcontext.S \
 @HAVE_GETCONTEXT_FALSE@	src/common/linux/breakpad_getcontext_unittest.cc
-@ANDROID_HOST_TRUE@am__append_23 = \
+@ANDROID_HOST_TRUE@am__append_25 = \
 @ANDROID_HOST_TRUE@	-llog -lm
 
-@ANDROID_HOST_TRUE@am__append_24 = \
+@ANDROID_HOST_TRUE@am__append_26 = \
 @ANDROID_HOST_TRUE@        -llog
 
+@LINUX_HOST_TRUE@am__append_27 = \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.o
+
+@LINUX_HOST_TRUE@am__append_28 = \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.o
+
+@LINUX_HOST_TRUE@am__append_29 = \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.o
+
+@LINUX_HOST_TRUE@am__append_30 = \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.o
+
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
@@ -306,7 +324,6 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/contained_range_map_unittest$(EXEEXT) \
-@DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_objdump_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver_unittest$(EXEEXT) \
@@ -334,13 +351,14 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 @DISABLE_PROCESSOR_FALSE@	src/processor/stackwalker_riscv64_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/stackwalker_x86_unittest$(EXEEXT) \
 @DISABLE_PROCESSOR_FALSE@	src/processor/synth_minidump_unittest$(EXEEXT)
-@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__EXEEXT_6 = src/processor/stackwalker_selftest$(EXEEXT)
-@LINUX_HOST_TRUE@am__EXEEXT_7 = src/client/linux/linux_client_unittest$(EXEEXT) \
+@DISABLE_PROCESSOR_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_6 = src/processor/disassembler_objdump_unittest$(EXEEXT)
+@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__EXEEXT_7 = src/processor/stackwalker_selftest$(EXEEXT)
+@LINUX_HOST_TRUE@am__EXEEXT_8 = src/client/linux/linux_client_unittest$(EXEEXT) \
 @LINUX_HOST_TRUE@	src/common/linux/google_crashdump_uploader_test$(EXEEXT)
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_8 = src/common/dumper_unittest$(EXEEXT) \
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_9 = src/common/dumper_unittest$(EXEEXT) \
 @DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@	src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT)
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__EXEEXT_9 = src/common/mac/macho_reader_unittest$(EXEEXT)
-@DISABLE_TOOLS_FALSE@@HAVE_MEMFD_CREATE_TRUE@@LINUX_HOST_TRUE@am__EXEEXT_10 = src/tools/linux/core_handler/core_handler$(EXEEXT)
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__EXEEXT_10 = src/common/mac/macho_reader_unittest$(EXEEXT)
+@DISABLE_TOOLS_FALSE@@HAVE_MEMFD_CREATE_TRUE@@LINUX_HOST_TRUE@am__EXEEXT_11 = src/tools/linux/core_handler/core_handler$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -436,13 +454,127 @@ src_client_linux_libbreakpad_client_a_OBJECTS =  \
 	$(am_src_client_linux_libbreakpad_client_a_OBJECTS)
 src_libbreakpad_a_AR = $(AR) $(ARFLAGS)
 src_libbreakpad_a_LIBADD =
+am__src_libbreakpad_a_SOURCES_DIST =  \
+	src/google_breakpad/common/breakpad_types.h \
+	src/google_breakpad/common/minidump_format.h \
+	src/google_breakpad/common/minidump_size.h \
+	src/google_breakpad/processor/basic_source_line_resolver.h \
+	src/google_breakpad/processor/call_stack.h \
+	src/google_breakpad/processor/code_module.h \
+	src/google_breakpad/processor/code_modules.h \
+	src/google_breakpad/processor/dump_context.h \
+	src/google_breakpad/processor/dump_object.h \
+	src/google_breakpad/processor/exploitability.h \
+	src/google_breakpad/processor/fast_source_line_resolver.h \
+	src/google_breakpad/processor/memory_region.h \
+	src/google_breakpad/processor/microdump.h \
+	src/google_breakpad/processor/microdump_processor.h \
+	src/google_breakpad/processor/minidump.h \
+	src/google_breakpad/processor/minidump_processor.h \
+	src/google_breakpad/processor/process_result.h \
+	src/google_breakpad/processor/process_state.h \
+	src/google_breakpad/processor/proc_maps_linux.h \
+	src/google_breakpad/processor/source_line_resolver_base.h \
+	src/google_breakpad/processor/source_line_resolver_interface.h \
+	src/google_breakpad/processor/stack_frame.h \
+	src/google_breakpad/processor/stack_frame_cpu.h \
+	src/google_breakpad/processor/stack_frame_symbolizer.h \
+	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/processor/basic_code_modules.cc \
+	src/processor/basic_code_modules.h \
+	src/processor/basic_source_line_resolver_types.h \
+	src/processor/basic_source_line_resolver.cc \
+	src/processor/call_stack.cc src/processor/cfi_frame_info.cc \
+	src/processor/cfi_frame_info.h \
+	src/processor/contained_range_map-inl.h \
+	src/processor/contained_range_map.h \
+	src/processor/convert_old_arm64_context.cc \
+	src/processor/convert_old_arm64_context.h \
+	src/processor/disassembler_x86.h \
+	src/processor/disassembler_x86.cc \
+	src/processor/dump_context.cc src/processor/dump_object.cc \
+	src/processor/exploitability.cc \
+	src/processor/exploitability_linux.h \
+	src/processor/exploitability_linux.cc \
+	src/processor/exploitability_win.h \
+	src/processor/exploitability_win.cc \
+	src/processor/fast_source_line_resolver_types.h \
+	src/processor/fast_source_line_resolver.cc \
+	src/processor/linked_ptr.h src/processor/logging.h \
+	src/processor/logging.cc src/processor/map_serializers-inl.h \
+	src/processor/map_serializers.h src/processor/microdump.cc \
+	src/processor/microdump_processor.cc src/processor/minidump.cc \
+	src/processor/minidump_processor.cc \
+	src/processor/module_comparer.cc \
+	src/processor/module_comparer.h src/processor/module_factory.h \
+	src/processor/module_serializer.cc \
+	src/processor/module_serializer.h \
+	src/processor/pathname_stripper.cc \
+	src/processor/pathname_stripper.h \
+	src/processor/postfix_evaluator-inl.h \
+	src/processor/postfix_evaluator.h \
+	src/processor/process_state.cc \
+	src/processor/proc_maps_linux.cc src/processor/range_map-inl.h \
+	src/processor/range_map.h \
+	src/processor/simple_serializer-inl.h \
+	src/processor/simple_serializer.h \
+	src/processor/simple_symbol_supplier.cc \
+	src/processor/simple_symbol_supplier.h \
+	src/processor/windows_frame_info.h \
+	src/processor/source_line_resolver_base_types.h \
+	src/processor/source_line_resolver_base.cc \
+	src/processor/stack_frame_cpu.cc \
+	src/processor/stack_frame_symbolizer.cc \
+	src/processor/stackwalk_common.cc \
+	src/processor/stackwalk_common.h src/processor/stackwalker.cc \
+	src/processor/stackwalker_amd64.cc \
+	src/processor/stackwalker_amd64.h \
+	src/processor/stackwalker_arm.cc \
+	src/processor/stackwalker_arm.h \
+	src/processor/stackwalker_arm64.cc \
+	src/processor/stackwalker_arm64.h \
+	src/processor/stackwalker_address_list.cc \
+	src/processor/stackwalker_address_list.h \
+	src/processor/stackwalker_mips.cc \
+	src/processor/stackwalker_mips.h \
+	src/processor/stackwalker_ppc.cc \
+	src/processor/stackwalker_ppc.h \
+	src/processor/stackwalker_ppc64.cc \
+	src/processor/stackwalker_ppc64.h \
+	src/processor/stackwalker_riscv.cc \
+	src/processor/stackwalker_riscv.h \
+	src/processor/stackwalker_riscv64.cc \
+	src/processor/stackwalker_riscv64.h \
+	src/processor/stackwalker_sparc.cc \
+	src/processor/stackwalker_sparc.h \
+	src/processor/stackwalker_x86.cc \
+	src/processor/stackwalker_x86.h \
+	src/processor/static_address_map-inl.h \
+	src/processor/static_address_map.h \
+	src/processor/static_contained_range_map-inl.h \
+	src/processor/static_contained_range_map.h \
+	src/processor/static_map_iterator-inl.h \
+	src/processor/static_map_iterator.h \
+	src/processor/static_map-inl.h src/processor/static_map.h \
+	src/processor/static_range_map-inl.h \
+	src/processor/static_range_map.h \
+	src/processor/symbolic_constants_win.cc \
+	src/processor/symbolic_constants_win.h \
+	src/processor/tokenize.cc src/processor/tokenize.h \
+	src/processor/disassembler_objdump.cc \
+	src/processor/disassembler_objdump.h
+@LINUX_HOST_TRUE@am__objects_2 =  \
+@LINUX_HOST_TRUE@	src/processor/disassembler_objdump.$(OBJEXT)
 am_src_libbreakpad_a_OBJECTS =  \
 	src/processor/basic_code_modules.$(OBJEXT) \
 	src/processor/basic_source_line_resolver.$(OBJEXT) \
 	src/processor/call_stack.$(OBJEXT) \
 	src/processor/cfi_frame_info.$(OBJEXT) \
 	src/processor/convert_old_arm64_context.$(OBJEXT) \
-	src/processor/disassembler_objdump.$(OBJEXT) \
 	src/processor/disassembler_x86.$(OBJEXT) \
 	src/processor/dump_context.$(OBJEXT) \
 	src/processor/dump_object.$(OBJEXT) \
@@ -478,7 +610,7 @@ am_src_libbreakpad_a_OBJECTS =  \
 	src/processor/stackwalker_sparc.$(OBJEXT) \
 	src/processor/stackwalker_x86.$(OBJEXT) \
 	src/processor/symbolic_constants_win.$(OBJEXT) \
-	src/processor/tokenize.$(OBJEXT)
+	src/processor/tokenize.$(OBJEXT) $(am__objects_2)
 src_libbreakpad_a_OBJECTS = $(am_src_libbreakpad_a_OBJECTS)
 src_testing_libtesting_a_AR = $(AR) $(ARFLAGS)
 src_testing_libtesting_a_LIBADD =
@@ -553,13 +685,13 @@ am__src_client_linux_linux_client_unittest_shlib_SOURCES_DIST =  \
 	src/processor/proc_maps_linux.cc \
 	src/common/linux/breakpad_getcontext.S \
 	src/common/linux/breakpad_getcontext_unittest.cc
-@SYSTEM_TEST_LIBS_FALSE@am__objects_2 = src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest-all.$(OBJEXT) \
+@SYSTEM_TEST_LIBS_FALSE@am__objects_3 = src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest-all.$(OBJEXT) \
 @SYSTEM_TEST_LIBS_FALSE@	src/testing/googletest/src/client_linux_linux_client_unittest_shlib-gtest_main.$(OBJEXT) \
 @SYSTEM_TEST_LIBS_FALSE@	src/testing/googlemock/src/client_linux_linux_client_unittest_shlib-gmock-all.$(OBJEXT)
-@HAVE_GETCONTEXT_FALSE@am__objects_3 = src/common/linux/client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT) \
+@HAVE_GETCONTEXT_FALSE@am__objects_4 = src/common/linux/client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT) \
 @HAVE_GETCONTEXT_FALSE@	src/common/linux/client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT)
 am_src_client_linux_linux_client_unittest_shlib_OBJECTS =  \
-	$(am__objects_2) \
+	$(am__objects_3) \
 	src/client/linux/handler/linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT) \
 	src/client/linux/microdump_writer/linux_client_unittest_shlib-microdump_writer_unittest.$(OBJEXT) \
 	src/client/linux/minidump_writer/linux_client_unittest_shlib-directory_reader_unittest.$(OBJEXT) \
@@ -585,7 +717,7 @@ am_src_client_linux_linux_client_unittest_shlib_OBJECTS =  \
 	src/processor/client_linux_linux_client_unittest_shlib-minidump.$(OBJEXT) \
 	src/processor/client_linux_linux_client_unittest_shlib-pathname_stripper.$(OBJEXT) \
 	src/processor/client_linux_linux_client_unittest_shlib-proc_maps_linux.$(OBJEXT) \
-	$(am__objects_3)
+	$(am__objects_4)
 src_client_linux_linux_client_unittest_shlib_OBJECTS =  \
 	$(am_src_client_linux_linux_client_unittest_shlib_OBJECTS)
 src_client_linux_linux_client_unittest_shlib_LINK = $(CXXLD) \
@@ -769,9 +901,7 @@ src_processor_exploitability_unittest_OBJECTS =  \
 src_processor_exploitability_unittest_DEPENDENCIES =  \
 	src/processor/convert_old_arm64_context.o \
 	src/processor/minidump_processor.o \
-	src/processor/process_state.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
+	src/processor/process_state.o src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
 	src/processor/exploitability_win.o \
@@ -801,7 +931,7 @@ src_processor_exploitability_unittest_DEPENDENCIES =  \
 	src/processor/symbolic_constants_win.o \
 	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__append_27)
 am_src_processor_fast_source_line_resolver_unittest_OBJECTS = src/processor/fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT)
 src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS)
 src_processor_fast_source_line_resolver_unittest_DEPENDENCIES =  \
@@ -901,7 +1031,6 @@ src_processor_minidump_processor_unittest_DEPENDENCIES =  \
 	src/processor/basic_source_line_resolver.o \
 	src/processor/call_stack.o src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o src/processor/dump_context.o \
 	src/processor/dump_object.o src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
@@ -927,7 +1056,7 @@ src_processor_minidump_processor_unittest_DEPENDENCIES =  \
 	src/processor/symbolic_constants_win.o \
 	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__append_28)
 am_src_processor_minidump_stackwalk_OBJECTS =  \
 	src/processor/minidump_stackwalk.$(OBJEXT)
 src_processor_minidump_stackwalk_OBJECTS =  \
@@ -937,7 +1066,6 @@ src_processor_minidump_stackwalk_DEPENDENCIES =  \
 	src/processor/basic_source_line_resolver.o \
 	src/processor/call_stack.o src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
 	src/processor/disassembler_x86.o src/processor/dump_context.o \
 	src/processor/dump_object.o src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
@@ -962,7 +1090,8 @@ src_processor_minidump_stackwalk_DEPENDENCIES =  \
 	src/processor/stackwalker_sparc.o \
 	src/processor/stackwalker_x86.o \
 	src/processor/symbolic_constants_win.o \
-	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a
+	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
+	$(am__append_30)
 am_src_processor_minidump_unittest_OBJECTS = src/common/processor_minidump_unittest-test_assembler.$(OBJEXT) \
 	src/processor/minidump_unittest-minidump_unittest.$(OBJEXT) \
 	src/processor/minidump_unittest-synth_minidump.$(OBJEXT)
@@ -1082,9 +1211,7 @@ src_processor_stackwalker_selftest_OBJECTS =  \
 src_processor_stackwalker_selftest_DEPENDENCIES =  \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
-	src/processor/call_stack.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
+	src/processor/call_stack.o src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
 	src/processor/exploitability_win.o src/processor/logging.o \
@@ -1105,7 +1232,7 @@ src_processor_stackwalker_selftest_DEPENDENCIES =  \
 	src/processor/stackwalker_riscv64.o \
 	src/processor/stackwalker_sparc.o \
 	src/processor/stackwalker_x86.o src/processor/tokenize.o \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_29)
 am_src_processor_stackwalker_x86_unittest_OBJECTS = src/common/processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT) \
 	src/processor/stackwalker_x86_unittest-stackwalker_x86_unittest.$(OBJEXT)
 src_processor_stackwalker_x86_unittest_OBJECTS =  \
@@ -1667,7 +1794,7 @@ SOURCES = $(src_client_linux_libbreakpad_client_a_SOURCES) \
 	$(src_tools_mac_dump_syms_dump_syms_mac_SOURCES)
 DIST_SOURCES =  \
 	$(am__src_client_linux_libbreakpad_client_a_SOURCES_DIST) \
-	$(src_libbreakpad_a_SOURCES) \
+	$(am__src_libbreakpad_a_SOURCES_DIST) \
 	$(am__src_testing_libtesting_a_SOURCES_DIST) \
 	$(src_third_party_libdisasm_libdisasm_a_SOURCES) \
 	$(src_client_linux_linux_client_unittest_SOURCES) \
@@ -2132,7 +2259,7 @@ includec_HEADERS = $(top_srcdir)/src/common/*.h
 includepdir = $(includedir)/$(PACKAGE)/processor
 includep_HEADERS = $(top_srcdir)/src/processor/*.h
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_6) $(am__append_12)
+pkgconfig_DATA = $(am__append_6) $(am__append_13)
 @SYSTEM_TEST_LIBS_FALSE@TEST_CFLAGS = \
 @SYSTEM_TEST_LIBS_FALSE@	-I$(top_srcdir)/src/testing/include \
 @SYSTEM_TEST_LIBS_FALSE@	-I$(top_srcdir)/src/testing/googletest/include \
@@ -2156,9 +2283,9 @@ pkgconfig_DATA = $(am__append_6) $(am__append_12)
 @ANDROID_HOST_TRUE@LOG_DRIVER = $(top_srcdir)/android/test-driver
 check_LIBRARIES = $(am__append_4)
 noinst_LIBRARIES = $(am__append_7)
-lib_LIBRARIES = $(am__append_5) $(am__append_11)
+lib_LIBRARIES = $(am__append_5) $(am__append_12)
 noinst_SCRIPTS = $(check_SCRIPTS)
-CLEANFILES = $(am__append_15)
+CLEANFILES = $(am__append_16)
 @SYSTEM_TEST_LIBS_FALSE@src_testing_libtesting_a_SOURCES = \
 @SYSTEM_TEST_LIBS_FALSE@	src/breakpad_googletest_includes.h \
 @SYSTEM_TEST_LIBS_FALSE@	src/testing/googletest/src/gtest-all.cc \
@@ -2196,7 +2323,7 @@ src_common_safe_math_unittest_LDADD = \
 
 
 # Breakpad processor library
-src_libbreakpad_a_SOURCES = \
+src_libbreakpad_a_SOURCES =  \
 	src/google_breakpad/common/breakpad_types.h \
 	src/google_breakpad/common/minidump_format.h \
 	src/google_breakpad/common/minidump_size.h \
@@ -2224,26 +2351,21 @@ src_libbreakpad_a_SOURCES = \
 	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/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 \
 	src/processor/basic_source_line_resolver.cc \
-	src/processor/call_stack.cc \
-	src/processor/cfi_frame_info.cc \
+	src/processor/call_stack.cc src/processor/cfi_frame_info.cc \
 	src/processor/cfi_frame_info.h \
 	src/processor/contained_range_map-inl.h \
 	src/processor/contained_range_map.h \
 	src/processor/convert_old_arm64_context.cc \
 	src/processor/convert_old_arm64_context.h \
-	src/processor/disassembler_objdump.h \
-	src/processor/disassembler_objdump.cc \
 	src/processor/disassembler_x86.h \
 	src/processor/disassembler_x86.cc \
-	src/processor/dump_context.cc \
-	src/processor/dump_object.cc \
+	src/processor/dump_context.cc src/processor/dump_object.cc \
 	src/processor/exploitability.cc \
 	src/processor/exploitability_linux.h \
 	src/processor/exploitability_linux.cc \
@@ -2251,18 +2373,13 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/exploitability_win.cc \
 	src/processor/fast_source_line_resolver_types.h \
 	src/processor/fast_source_line_resolver.cc \
-	src/processor/linked_ptr.h \
-	src/processor/logging.h \
-	src/processor/logging.cc \
-	src/processor/map_serializers-inl.h \
-	src/processor/map_serializers.h \
-	src/processor/microdump.cc \
-	src/processor/microdump_processor.cc \
-	src/processor/minidump.cc \
+	src/processor/linked_ptr.h src/processor/logging.h \
+	src/processor/logging.cc src/processor/map_serializers-inl.h \
+	src/processor/map_serializers.h src/processor/microdump.cc \
+	src/processor/microdump_processor.cc src/processor/minidump.cc \
 	src/processor/minidump_processor.cc \
 	src/processor/module_comparer.cc \
-	src/processor/module_comparer.h \
-	src/processor/module_factory.h \
+	src/processor/module_comparer.h src/processor/module_factory.h \
 	src/processor/module_serializer.cc \
 	src/processor/module_serializer.h \
 	src/processor/pathname_stripper.cc \
@@ -2270,8 +2387,7 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/postfix_evaluator-inl.h \
 	src/processor/postfix_evaluator.h \
 	src/processor/process_state.cc \
-	src/processor/proc_maps_linux.cc \
-	src/processor/range_map-inl.h \
+	src/processor/proc_maps_linux.cc src/processor/range_map-inl.h \
 	src/processor/range_map.h \
 	src/processor/simple_serializer-inl.h \
 	src/processor/simple_serializer.h \
@@ -2283,8 +2399,7 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/stack_frame_cpu.cc \
 	src/processor/stack_frame_symbolizer.cc \
 	src/processor/stackwalk_common.cc \
-	src/processor/stackwalk_common.h \
-	src/processor/stackwalker.cc \
+	src/processor/stackwalk_common.h src/processor/stackwalker.cc \
 	src/processor/stackwalker_amd64.cc \
 	src/processor/stackwalker_amd64.h \
 	src/processor/stackwalker_arm.cc \
@@ -2313,15 +2428,13 @@ src_libbreakpad_a_SOURCES = \
 	src/processor/static_contained_range_map.h \
 	src/processor/static_map_iterator-inl.h \
 	src/processor/static_map_iterator.h \
-	src/processor/static_map-inl.h \
-	src/processor/static_map.h \
+	src/processor/static_map-inl.h src/processor/static_map.h \
 	src/processor/static_range_map-inl.h \
 	src/processor/static_range_map.h \
 	src/processor/symbolic_constants_win.cc \
 	src/processor/symbolic_constants_win.h \
-	src/processor/tokenize.cc \
-	src/processor/tokenize.h
-
+	src/processor/tokenize.cc src/processor/tokenize.h \
+	$(am__append_22)
 
 # libdisasm 3rd party library
 src_third_party_libdisasm_libdisasm_a_SOURCES = \
@@ -2382,7 +2495,7 @@ src_client_linux_libbreakpad_client_a_SOURCES =  \
 	src/common/linux/guid_creator.h \
 	src/common/linux/linux_libc_support.cc \
 	src/common/linux/memory_mapped_file.cc \
-	src/common/linux/safe_readlink.cc $(am__append_21)
+	src/common/linux/safe_readlink.cc $(am__append_23)
 
 # Client tests
 src_client_linux_linux_dumper_unittest_helper_SOURCES = \
@@ -2420,12 +2533,12 @@ src_client_linux_linux_client_unittest_shlib_SOURCES =  \
 	src/processor/dump_context.cc src/processor/dump_object.cc \
 	src/processor/logging.cc src/processor/minidump.cc \
 	src/processor/pathname_stripper.cc \
-	src/processor/proc_maps_linux.cc $(am__append_22)
+	src/processor/proc_maps_linux.cc $(am__append_24)
 src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(TEST_CFLAGS)
 
 src_client_linux_linux_client_unittest_shlib_LDFLAGS = -shared \
-	-Wl,-h,linux_client_unittest_shlib $(am__append_23)
+	-Wl,-h,linux_client_unittest_shlib $(am__append_25)
 src_client_linux_linux_client_unittest_shlib_LDADD = \
 	src/client/linux/crash_generation/crash_generation_client.o \
 	src/client/linux/dump_writer_common/thread_info.o \
@@ -2461,7 +2574,7 @@ src_client_linux_linux_client_unittest_SOURCES =
 src_client_linux_linux_client_unittest_LDFLAGS =  \
 	-Wl,-rpath,'$$ORIGIN' \
 	-Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f \
-	$(am__append_24)
+	$(am__append_26)
 src_client_linux_linux_client_unittest_LDADD = \
 	src/client/linux/linux_client_unittest_shlib \
 	$(TEST_LIBS)
@@ -2765,23 +2878,18 @@ src_processor_exploitability_unittest_SOURCES = \
 src_processor_exploitability_unittest_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(TEST_CFLAGS)
 
-src_processor_exploitability_unittest_LDADD = \
+src_processor_exploitability_unittest_LDADD =  \
 	src/processor/convert_old_arm64_context.o \
 	src/processor/minidump_processor.o \
-	src/processor/process_state.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
+	src/processor/process_state.o src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
 	src/processor/exploitability_win.o \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
-	src/processor/call_stack.o \
-	src/processor/cfi_frame_info.o \
-	src/processor/dump_context.o \
-	src/processor/dump_object.o \
-	src/processor/logging.o \
-	src/processor/minidump.o \
+	src/processor/call_stack.o src/processor/cfi_frame_info.o \
+	src/processor/dump_context.o src/processor/dump_object.o \
+	src/processor/logging.o src/processor/minidump.o \
 	src/processor/pathname_stripper.o \
 	src/processor/proc_maps_linux.o \
 	src/processor/simple_symbol_supplier.o \
@@ -2801,11 +2909,9 @@ src_processor_exploitability_unittest_LDADD = \
 	src/processor/stackwalker_sparc.o \
 	src/processor/stackwalker_x86.o \
 	src/processor/symbolic_constants_win.o \
-	src/processor/tokenize.o \
-	src/third_party/libdisasm/libdisasm.a \
-	$(TEST_LIBS) \
-	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-
+	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
+	$(TEST_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
+	$(am__append_27)
 src_processor_disassembler_objdump_unittest_SOURCES = \
 	src/processor/disassembler_objdump_unittest.cc
 
@@ -2908,25 +3014,18 @@ src_processor_minidump_processor_unittest_SOURCES = \
 src_processor_minidump_processor_unittest_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(TEST_CFLAGS)
 
-src_processor_minidump_processor_unittest_LDADD = \
+src_processor_minidump_processor_unittest_LDADD =  \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
-	src/processor/call_stack.o \
-	src/processor/cfi_frame_info.o \
+	src/processor/call_stack.o src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
-	src/processor/dump_context.o \
-	src/processor/dump_object.o \
-	src/processor/exploitability.o \
+	src/processor/disassembler_x86.o src/processor/dump_context.o \
+	src/processor/dump_object.o src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
-	src/processor/exploitability_win.o \
-	src/processor/logging.o \
-	src/processor/minidump_processor.o \
-	src/processor/minidump.o \
+	src/processor/exploitability_win.o src/processor/logging.o \
+	src/processor/minidump_processor.o src/processor/minidump.o \
 	src/processor/pathname_stripper.o \
-	src/processor/process_state.o \
-	src/processor/proc_maps_linux.o \
+	src/processor/process_state.o src/processor/proc_maps_linux.o \
 	src/processor/source_line_resolver_base.o \
 	src/processor/stack_frame_cpu.o \
 	src/processor/stack_frame_symbolizer.o \
@@ -2943,11 +3042,9 @@ src_processor_minidump_processor_unittest_LDADD = \
 	src/processor/stackwalker_sparc.o \
 	src/processor/stackwalker_x86.o \
 	src/processor/symbolic_constants_win.o \
-	src/processor/tokenize.o \
-	src/third_party/libdisasm/libdisasm.a \
-	$(TEST_LIBS) \
-	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-
+	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
+	$(TEST_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
+	$(am__append_28)
 src_processor_minidump_unittest_SOURCES = \
 	src/common/test_assembler.cc \
 	src/processor/minidump_unittest.cc \
@@ -3080,18 +3177,14 @@ src_processor_range_map_unittest_LDADD = \
 src_processor_stackwalker_selftest_SOURCES = \
 	src/processor/stackwalker_selftest.cc
 
-src_processor_stackwalker_selftest_LDADD = \
+src_processor_stackwalker_selftest_LDADD =  \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
-	src/processor/call_stack.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
+	src/processor/call_stack.o src/processor/disassembler_x86.o \
 	src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
-	src/processor/exploitability_win.o \
-	src/processor/logging.o \
-	src/processor/minidump.o \
-	src/processor/pathname_stripper.o \
+	src/processor/exploitability_win.o src/processor/logging.o \
+	src/processor/minidump.o src/processor/pathname_stripper.o \
 	src/processor/proc_maps_linux.o \
 	src/processor/source_line_resolver_base.o \
 	src/processor/stack_frame_cpu.o \
@@ -3107,10 +3200,8 @@ src_processor_stackwalker_selftest_LDADD = \
 	src/processor/stackwalker_riscv.o \
 	src/processor/stackwalker_riscv64.o \
 	src/processor/stackwalker_sparc.o \
-	src/processor/stackwalker_x86.o \
-	src/processor/tokenize.o \
-	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-
+	src/processor/stackwalker_x86.o src/processor/tokenize.o \
+	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(am__append_29)
 src_processor_stackwalker_amd64_unittest_SOURCES = \
 	src/common/test_assembler.cc \
 	src/processor/stackwalker_amd64_unittest.cc
@@ -3328,32 +3419,23 @@ src_processor_microdump_stackwalk_LDADD = \
 src_processor_minidump_stackwalk_SOURCES = \
 	src/processor/minidump_stackwalk.cc
 
-src_processor_minidump_stackwalk_LDADD = \
-	src/common/path_helper.o \
+src_processor_minidump_stackwalk_LDADD = src/common/path_helper.o \
 	src/processor/basic_code_modules.o \
 	src/processor/basic_source_line_resolver.o \
-	src/processor/call_stack.o \
-	src/processor/cfi_frame_info.o \
+	src/processor/call_stack.o src/processor/cfi_frame_info.o \
 	src/processor/convert_old_arm64_context.o \
-	src/processor/disassembler_objdump.o \
-	src/processor/disassembler_x86.o \
-	src/processor/dump_context.o \
-	src/processor/dump_object.o \
-	src/processor/exploitability.o \
+	src/processor/disassembler_x86.o src/processor/dump_context.o \
+	src/processor/dump_object.o src/processor/exploitability.o \
 	src/processor/exploitability_linux.o \
-	src/processor/exploitability_win.o \
-	src/processor/logging.o \
-	src/processor/minidump.o \
-	src/processor/minidump_processor.o \
+	src/processor/exploitability_win.o src/processor/logging.o \
+	src/processor/minidump.o src/processor/minidump_processor.o \
 	src/processor/pathname_stripper.o \
-	src/processor/process_state.o \
-	src/processor/proc_maps_linux.o \
+	src/processor/process_state.o src/processor/proc_maps_linux.o \
 	src/processor/simple_symbol_supplier.o \
 	src/processor/source_line_resolver_base.o \
 	src/processor/stack_frame_cpu.o \
 	src/processor/stack_frame_symbolizer.o \
-	src/processor/stackwalk_common.o \
-	src/processor/stackwalker.o \
+	src/processor/stackwalk_common.o src/processor/stackwalker.o \
 	src/processor/stackwalker_address_list.o \
 	src/processor/stackwalker_amd64.o \
 	src/processor/stackwalker_arm.o \
@@ -3366,9 +3448,8 @@ src_processor_minidump_stackwalk_LDADD = \
 	src/processor/stackwalker_sparc.o \
 	src/processor/stackwalker_x86.o \
 	src/processor/symbolic_constants_win.o \
-	src/processor/tokenize.o \
-	src/third_party/libdisasm/libdisasm.a
-
+	src/processor/tokenize.o src/third_party/libdisasm/libdisasm.a \
+	$(am__append_30)
 EXTRA_DIST = \
 	$(SCRIPTS) \
 	src/client/linux/data/linux-gate-amd.sym \
@@ -3965,9 +4046,6 @@ src/processor/cfi_frame_info.$(OBJEXT): src/processor/$(am__dirstamp) \
 src/processor/convert_old_arm64_context.$(OBJEXT):  \
 	src/processor/$(am__dirstamp) \
 	src/processor/$(DEPDIR)/$(am__dirstamp)
-src/processor/disassembler_objdump.$(OBJEXT):  \
-	src/processor/$(am__dirstamp) \
-	src/processor/$(DEPDIR)/$(am__dirstamp)
 src/processor/disassembler_x86.$(OBJEXT):  \
 	src/processor/$(am__dirstamp) \
 	src/processor/$(DEPDIR)/$(am__dirstamp)
@@ -4067,6 +4145,9 @@ src/processor/symbolic_constants_win.$(OBJEXT):  \
 	src/processor/$(DEPDIR)/$(am__dirstamp)
 src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \
 	src/processor/$(DEPDIR)/$(am__dirstamp)
+src/processor/disassembler_objdump.$(OBJEXT):  \
+	src/processor/$(am__dirstamp) \
+	src/processor/$(DEPDIR)/$(am__dirstamp)
 src/$(am__dirstamp):
 	@$(MKDIR_P) src
 	@: > src/$(am__dirstamp)
@@ -8766,13 +8847,6 @@ src/processor/contained_range_map_unittest.log: src/processor/contained_range_ma
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/processor/disassembler_objdump_unittest.log: src/processor/disassembler_objdump_unittest$(EXEEXT)
-	@p='src/processor/disassembler_objdump_unittest$(EXEEXT)'; \
-	b='src/processor/disassembler_objdump_unittest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 src/processor/disassembler_x86_unittest.log: src/processor/disassembler_x86_unittest$(EXEEXT)
 	@p='src/processor/disassembler_x86_unittest$(EXEEXT)'; \
 	b='src/processor/disassembler_x86_unittest'; \
@@ -8962,6 +9036,13 @@ src/processor/synth_minidump_unittest.log: src/processor/synth_minidump_unittest
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+src/processor/disassembler_objdump_unittest.log: src/processor/disassembler_objdump_unittest$(EXEEXT)
+	@p='src/processor/disassembler_objdump_unittest$(EXEEXT)'; \
+	b='src/processor/disassembler_objdump_unittest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 src/processor/stackwalker_selftest.log: src/processor/stackwalker_selftest$(EXEEXT)
 	@p='src/processor/stackwalker_selftest$(EXEEXT)'; \
 	b='src/processor/stackwalker_selftest'; \
diff --git a/src/processor/disassembler_objdump.cc b/src/processor/disassembler_objdump.cc
index dfe10d58..c6b6ac57 100644
--- a/src/processor/disassembler_objdump.cc
+++ b/src/processor/disassembler_objdump.cc
@@ -32,7 +32,6 @@
 
 #include "processor/disassembler_objdump.h"
 
-#ifdef __linux__
 #include <unistd.h>
 #include <fstream>
 #include <iostream>
@@ -498,23 +497,5 @@ bool DisassemblerObjdump::CalculateDestAddress(const DumpContext& context,
                                                uint64_t& address) {
   return CalculateAddress(context, dest_, address);
 }
-}  // namespace google_breakpad
 
-#else  // __linux__
-namespace google_breakpad {
-DisassemblerObjdump::DisassemblerObjdump(const uint32_t cpu,
-                                         const MemoryRegion* memory_region,
-                                         uint64_t address) {}
-
-bool DisassemblerObjdump::CalculateSrcAddress(const DumpContext& context,
-                                              uint64_t& address) {
-  return false;
-}
-
-bool DisassemblerObjdump::CalculateDestAddress(const DumpContext& context,
-                                               uint64_t& address) {
-  return false;
-}
-}  // namespace google_breakpad
-
-#endif  // __linux__
+}  // namespace google_breakpad
\ No newline at end of file
diff --git a/src/processor/exploitability_linux.cc b/src/processor/exploitability_linux.cc
index 63a12656..c48bbdf5 100644
--- a/src/processor/exploitability_linux.cc
+++ b/src/processor/exploitability_linux.cc
@@ -41,7 +41,9 @@
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/process_state.h"
 #include "google_breakpad/processor/stack_frame.h"
+#ifdef __linux__
 #include "processor/disassembler_objdump.h"
+#endif
 #include "processor/logging.h"
 
 namespace {
@@ -156,7 +158,7 @@ ExploitabilityRating ExploitabilityLinux::CheckPlatformExploitability() {
 }
 
 bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
-#ifdef _WIN32
+#ifndef __linux__
   BPLOG(INFO) << "MinGW does not support fork and exec. Terminating method.";
   return false;
 #else
@@ -220,7 +222,7 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
   } else {
     return false;
   }
-#endif  // _WIN32
+#endif  // __linux__
 }
 
 bool ExploitabilityLinux::StackPointerOffStack(uint64_t stack_ptr) {
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index fb330e26..d72926cb 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -44,11 +44,14 @@
 #include "google_breakpad/processor/process_state.h"
 #include "google_breakpad/processor/exploitability.h"
 #include "google_breakpad/processor/stack_frame_symbolizer.h"
-#include "processor/disassembler_objdump.h"
 #include "processor/logging.h"
 #include "processor/stackwalker_x86.h"
 #include "processor/symbolic_constants_win.h"
 
+#ifdef __linux__
+#include "processor/disassembler_objdump.h"
+#endif
+
 namespace google_breakpad {
 
 MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
@@ -770,6 +773,7 @@ static bool IsCanonicalAddress(uint64_t address) {
   return true;
 }
 
+#ifdef __linux__
 static void CalculateFaultAddressFromInstruction(Minidump* dump,
                                                  uint64_t* address) {
   MinidumpException* exception = dump->GetException();
@@ -832,6 +836,7 @@ static void CalculateFaultAddressFromInstruction(Minidump* dump,
     *address = write_address;
   }
 }
+#endif // __linux__
 
 // static
 string MinidumpProcessor::GetCrashReason(Minidump* dump, uint64_t* address,
@@ -2070,6 +2075,7 @@ string MinidumpProcessor::GetCrashReason(Minidump* dump, uint64_t* address,
       static_cast<MDCPUArchitecture>(raw_system_info->processor_architecture),
       *address);
 
+#ifdef __linux__
     // For invalid accesses to non-canonical addresses, amd64 cpus don't provide
     // the fault address, so recover it from the disassembly and register state
     // if possible.
@@ -2078,6 +2084,7 @@ string MinidumpProcessor::GetCrashReason(Minidump* dump, uint64_t* address,
         && std::numeric_limits<uint64_t>::max() == *address) {
       CalculateFaultAddressFromInstruction(dump, address);
     }
+#endif // __linux__
   }
 
   return reason;