Build ELF linux/dump_syms everywhere (also for macOS and for Windows with MinGW)

Makefile.am

@@ -52,8 +52,8 @@ AM_CXXFLAGS += -fPIC
 endif
 
 if WINDOWS_HOST
-# don't have stab.h, don't build stabs support
-AM_CPPFLAGS += -DNO_STABS_SUPPORT
+# Windows doesn't have stab.h
+AM_CPPFLAGS += -I$(top_srcdir)/src/third_party/stab/include
 endif
 
 if MINGW_HOST
@@ -62,6 +62,10 @@ AM_CPPFLAGS += -D_POSIX_C_SOURCE
 AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO
 endif
 
+if MACOS_HOST
+AM_CPPFLAGS += -Wno-deprecated-declarations
+endif
+
 # Specify include paths for ac macros
 ACLOCAL_AMFLAGS = -I m4
 
@@ -391,11 +395,16 @@ bin_PROGRAMS += \
 	src/tools/windows/dump_syms_dwarf/dump_syms_dwarf
 endif
 
+if !DISABLE_TOOLS
+bin_PROGRAMS += \
+	src/tools/linux/dump_syms/dump_syms
+endif
+
 if MINGW_HOST
 # For MinGW, use gyp to generate a Makefile to build Windows client library
 Configuration ?= Debug
 all-local:
-	cd $(top_srcdir)/src ; ./tools/gyp/gyp --no-circular-check --no-parallel --depth=. -f make client/windows/breakpad_client.gyp
+	cd $(top_srcdir)/src ; GYP_DEFINES='OS=win' ./tools/gyp/gyp --no-circular-check --no-parallel --depth=. -f make client/windows/breakpad_client.gyp
 	cd $(top_srcdir)/src ; $(MAKE) CXX="$(CXX)" CXXFLAGS="-DUNICODE -D_UNICODE $(AM_CPPFLAGS) $(CXXFLAGS)" AR="$(AR)" RC="$(WINDRES)" BUILDTYPE="$(Configuration)"
 endif
 
@@ -627,36 +636,6 @@ src_tools_linux_pid2md_pid2md_SOURCES = \
 src_tools_linux_pid2md_pid2md_LDADD = \
 	src/client/linux/libbreakpad_client.a
 
-src_tools_linux_dump_syms_dump_syms_SOURCES = \
-	src/common/dwarf_cfi_to_module.cc \
-	src/common/dwarf_cu_to_module.cc \
-	src/common/dwarf_line_to_module.cc \
-	src/common/dwarf_range_list_handler.cc \
-	src/common/language.cc \
-	src/common/module.cc \
-	src/common/path_helper.cc \
-	src/common/stabs_reader.cc \
-	src/common/stabs_to_module.cc \
-	src/common/dwarf/bytereader.cc \
-	src/common/dwarf/dwarf2diehandler.cc \
-	src/common/dwarf/dwarf2reader.cc \
-	src/common/dwarf/elf_reader.cc \
-	src/common/linux/crc32.cc \
-	src/common/linux/dump_symbols.cc \
-	src/common/linux/dump_symbols.h \
-	src/common/linux/elf_symbols_to_module.cc \
-	src/common/linux/elf_symbols_to_module.h \
-	src/common/linux/elfutils.cc \
-	src/common/linux/file_id.cc \
-	src/common/linux/linux_libc_support.cc \
-	src/common/linux/memory_mapped_file.cc \
-	src/common/linux/safe_readlink.cc \
-	src/tools/linux/dump_syms/dump_syms.cc
-src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
-	$(RUST_DEMANGLE_CFLAGS)
-src_tools_linux_dump_syms_dump_syms_LDADD = \
-	$(RUST_DEMANGLE_LIBS)
-
 src_tools_linux_md2core_minidump_2_core_SOURCES = \
 	src/common/linux/memory_mapped_file.cc \
 	src/common/path_helper.cc \
@@ -855,6 +834,37 @@ src_tools_windows_dump_syms_dwarf_dump_syms_dwarf_SOURCES = \
 	src/tools/windows/dump_syms_dwarf/dump_syms.cc
 src_tools_windows_dump_syms_dwarf_dump_syms_dwarf_LDADD = \
 	$(SOCKET_LIBS)
+
+src_tools_linux_dump_syms_dump_syms_SOURCES = \
+	src/common/dwarf_cfi_to_module.cc \
+	src/common/dwarf_cu_to_module.cc \
+	src/common/dwarf_line_to_module.cc \
+	src/common/dwarf_range_list_handler.cc \
+	src/common/language.cc \
+	src/common/module.cc \
+	src/common/path_helper.cc \
+	src/common/stabs_reader.cc \
+	src/common/stabs_to_module.cc \
+	src/common/dwarf/bytereader.cc \
+	src/common/dwarf/dwarf2diehandler.cc \
+	src/common/dwarf/dwarf2reader.cc \
+	src/common/dwarf/elf_reader.cc \
+	src/common/linux/crc32.cc \
+	src/common/linux/dump_symbols.cc \
+	src/common/linux/dump_symbols.h \
+	src/common/linux/elf_symbols_to_module.cc \
+	src/common/linux/elf_symbols_to_module.h \
+	src/common/linux/elfutils.cc \
+	src/common/linux/file_id.cc \
+	src/common/linux/linux_libc_support.cc \
+	src/common/linux/memory_mapped_file.cc \
+	src/common/linux/safe_readlink.cc \
+	src/tools/linux/dump_syms/dump_syms.cc
+src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
+	$(RUST_DEMANGLE_CFLAGS)
+src_tools_linux_dump_syms_dump_syms_LDADD = \
+	$(RUST_DEMANGLE_LIBS) \
+	$(SOCKET_LIBS)
 endif
 
 if !DISABLE_PROCESSOR

configure.ac

@@ -115,6 +115,9 @@ case $host in
   *-*-linux* | *-android* )
     LINUX_HOST=true
     ;;
+  *-apple-*)
+    MACOS_HOST=true
+    ;;
   *-*-cygwin* )
     WINDOWS_HOST=true
     ;;
@@ -125,6 +128,7 @@ case $host in
 esac
 
 AM_CONDITIONAL(LINUX_HOST, test x$LINUX_HOST = xtrue)
+AM_CONDITIONAL(MACOS_HOST, test x$MACOS_HOST = xtrue)
 # WINDOWS_HOST means MINGW or CYGWIN
 AM_CONDITIONAL(WINDOWS_HOST, test x$WINDOWS_HOST = xtrue)
 AM_CONDITIONAL(MINGW_HOST, test x$MINGW_HOST = xtrue)

src/common/dwarf/elf_reader.cc

@@ -30,10 +30,13 @@
 #define _GNU_SOURCE  // needed for pread()
 #endif
 
+#include "compat/linux.h"
+#include "compat/elf.h"
+#include "compat/mman.h"
+
 #include <fcntl.h>
 #include <limits.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -46,7 +49,6 @@
 // Also need to add configure tests for zlib.
 //#include "zlib.h"
 
-#include "third_party/musl/include/elf.h"
 #include "elf_reader.h"
 #include "common/using_std_string.h"
 

src/common/linux/dump_symbols.cc

@@ -32,19 +32,21 @@
 // dump_symbols.cc: implement google_breakpad::WriteSymbolFile:
 // Find all the debugging info in a file and dump it as a Breakpad symbol file.
 
+#include "compat/linux.h"
+#include "compat/elf.h"
+#include "compat/link.h"
+#include "compat/mman.h"
+
 #include "common/linux/dump_symbols.h"
 
 #include <assert.h>
-#include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <link.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 

src/common/linux/elf_gnu_compat.h

@@ -36,7 +36,7 @@
 #ifndef COMMON_LINUX_ELF_GNU_COMPAT_H_
 #define COMMON_LINUX_ELF_GNU_COMPAT_H_
 
-#include <elf.h>
+#include "compat/elf.h"
 
 // A note type on GNU systems corresponding to the .note.gnu.build-id section.
 #ifndef NT_GNU_BUILD_ID

src/common/linux/elf_symbols_to_module.cc

@@ -30,10 +30,12 @@
 
 // Original author: Ted Mielczarek <ted.mielczarek@gmail.com>
 
+#include "compat/linux.h"
+#include "compat/elf.h"
+
 #include "common/linux/elf_symbols_to_module.h"
 
 #include <cxxabi.h>
-#include <elf.h>
 #include <string.h>
 
 #include "common/byte_cursor.h"

src/common/linux/elfutils.h

@@ -33,8 +33,9 @@
 #ifndef COMMON_LINUX_ELFUTILS_H_
 #define COMMON_LINUX_ELFUTILS_H_
 
-#include <elf.h>
-#include <link.h>
+#include "compat/elf.h"
+#include "compat/link.h"
+
 #include <stdint.h>
 
 #include "common/memory_allocator.h"

src/common/linux/file_id.cc

@@ -32,9 +32,10 @@
 // See file_id.h for documentation
 //
 
+#include "compat/inet.h"
+
 #include "common/linux/file_id.h"
 
-#include <arpa/inet.h>
 #include <assert.h>
 #include <string.h>
 

src/common/linux/guid_creator.cc

@@ -92,12 +92,12 @@ class GUIDGenerator {
 #endif
 
     // Put in the version according to RFC 4122.
-    guid->data3 &= 0x0fff;
-    guid->data3 |= 0x4000;
+    guid->COMPAT_GUID_DATA3 &= 0x0fff;
+    guid->COMPAT_GUID_DATA3 |= 0x4000;
 
     // Put in the variant according to RFC 4122.
-    guid->data4[0] &= 0x3f;
-    guid->data4[0] |= 0x80;
+    guid->COMPAT_GUID_DATA4[0] &= 0x3f;
+    guid->COMPAT_GUID_DATA4[0] |= 0x80;
 
     return true;
   }
@@ -178,9 +178,9 @@ bool GUIDToString(const GUID *guid, char *buf, int buf_len) {
   // Should allow more space the the max length of GUID.
   assert(buf_len > kGUIDStringLength);
   int num = snprintf(buf, buf_len, kGUIDFormatString,
-                     guid->data1, guid->data2, guid->data3,
-                     GUIDGenerator::BytesToUInt32(&(guid->data4[0])),
-                     GUIDGenerator::BytesToUInt32(&(guid->data4[4])));
+                     guid->COMPAT_GUID_DATA1, guid->COMPAT_GUID_DATA2, guid->COMPAT_GUID_DATA3,
+                     GUIDGenerator::BytesToUInt32(&(guid->COMPAT_GUID_DATA4[0])),
+                     GUIDGenerator::BytesToUInt32(&(guid->COMPAT_GUID_DATA4[4])));
   if (num != kGUIDStringLength)
     return false;
 

src/common/linux/guid_creator.h

@@ -30,9 +30,11 @@
 #ifndef COMMON_LINUX_GUID_CREATOR_H__
 #define COMMON_LINUX_GUID_CREATOR_H__
 
+// Set MDGUID.
 #include "google_breakpad/common/minidump_format.h"
 
-typedef MDGUID GUID;
+// Use MDGUID.
+#include "compat/guiddef.h"
 
 // Format string for parsing GUID.
 #define kGUIDFormatString "%08x-%04x-%04x-%08x-%08x"

src/common/linux/memory_mapped_file.cc

@@ -30,10 +30,12 @@
 // memory_mapped_file.cc: Implement google_breakpad::MemoryMappedFile.
 // See memory_mapped_file.h for details.
 
+#include "compat/linux.h"
+#include "compat/mman.h"
+
 #include "common/linux/memory_mapped_file.h"
 
 #include <fcntl.h>
-#include <sys/mman.h>
 #if defined(__ANDROID__)
 #include <sys/stat.h>
 #endif

src/common/linux/safe_readlink.cc

@@ -30,9 +30,10 @@
 // safe_readlink.cc: Implement google_breakpad::SafeReadLink.
 // See safe_readlink.h for details.
 
-#include <stddef.h>
+#include "compat/linux.h"
+#include "compat/syscall.h"
 
-#include "third_party/lss/linux_syscall_support.h"
+#include <stddef.h>
 
 namespace google_breakpad {
 

src/common/memory_allocator.h

@@ -30,10 +30,13 @@
 #ifndef GOOGLE_BREAKPAD_COMMON_MEMORY_ALLOCATOR_H_
 #define GOOGLE_BREAKPAD_COMMON_MEMORY_ALLOCATOR_H_
 
+#include "compat/linux.h"
+#include "compat/mman.h"
+#include "compat/syscall.h"
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/mman.h>
 
 #include <memory>
 #include <vector>
@@ -42,14 +45,6 @@
 #include <sanitizer/msan_interface.h>
 #endif
 
-#ifdef __APPLE__
-#define sys_mmap mmap
-#define sys_munmap munmap
-#define MAP_ANONYMOUS MAP_ANON
-#else
-#include "third_party/lss/linux_syscall_support.h"
-#endif
-
 namespace google_breakpad {
 
 // This is very simple allocator which fetches pages from the kernel directly.

src/common/stabs_reader.cc

@@ -31,6 +31,8 @@
 // This file implements the google_breakpad::StabsReader class.
 // See stabs_reader.h.
 
+#include "compat/linux.h"
+
 #include "common/stabs_reader.h"
 
 #include <assert.h>

src/compat/elf.h

@@ -0,0 +1,19 @@
+#ifndef SRC_COMPAT_ELF_H_
+#define SRC_COMPAT_ELF_H_
+
+#if defined(__linux__)
+#include <elf.h>
+#else
+#include "third_party/musl/include/elf.h"
+
+#if defined(_WIN32)
+#if defined(_WIN64)
+#define ElfW(type) Elf64_##type
+#else
+#define ElfW(type) Elf32_##type
+#endif
+#endif
+
+#endif // !defined(__linux__)
+
+#endif // SRC_COMPAT_ELF_H_

src/compat/guiddef.h

@@ -0,0 +1,22 @@
+#ifndef SRC_COMPAT_GUIDDEF_H_
+#define SRC_COMPAT_GUIDDEF_H_
+
+#if defined(_WIN32)
+#include <guiddef.h>
+#else
+typedef MDGUID GUID;
+#endif
+
+#if defined(_WIN32)
+#define COMPAT_GUID_DATA1 Data1
+#define COMPAT_GUID_DATA2 Data2
+#define COMPAT_GUID_DATA3 Data3
+#define COMPAT_GUID_DATA4 Data4
+#else
+#define COMPAT_GUID_DATA1 data1
+#define COMPAT_GUID_DATA2 data2
+#define COMPAT_GUID_DATA3 data3
+#define COMPAT_GUID_DATA4 data4
+#endif
+
+#endif // SRC_COMPAT_GUIDDEF_H_

src/compat/inet.h

@@ -0,0 +1,10 @@
+#ifndef SRC_COMPAT_INET_H_
+#define SRC_COMPAT_INET_H_
+
+#if defined(_WIN32)
+#include <winsock2.h>
+#else
+#include <arpa/inet.h>
+#endif
+
+#endif // SRC_COMPAT_INET_H_

src/compat/link.h

@@ -0,0 +1,8 @@
+#ifndef SRC_COMPAT_LINK_H_
+#define SRC_COMPAT_LINK_H_
+
+#if !defined(_WIN32) && !defined(__APPLE__)
+#include <link.h>
+#endif
+
+#endif // SRC_COMPAT_LINK_H_