Skip to content

Make macOS' dump_syms_mac buildable and runnable on any system #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make macOS' dump_syms_mac buildable and runnable on any system #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5209fe4
makefile: only use vendored macOS headers on non-macOS build systems
illwieckz Oct 12, 2026
95a0d15
makefile: enable the building of dump_syms_mac on every system
illwieckz Oct 12, 2026
9749593
configure: drop the now unused X86_HOST variable
illwieckz Oct 12, 2026
bc70ca5
src/common/mac/byteswap: define byteswap symbols for MinGW
illwieckz Oct 12, 2026
3ed05c8
src/common/mac/byteswap: add compat/linux.h compatibility to define p…
illwieckz Oct 12, 2026
cfb60a6
configure: detect macOS build machine
illwieckz Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 33 additions & 10 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,21 @@ check_SCRIPTS = \
src/processor/minidump_stackwalk_test \
src/processor/minidump_stackwalk_machine_readable_test

## dump_syms tests
check_DEPS = \
src/tools/linux/dump_syms/dump_syms \
src/tools/windows/dump_syms_dwarf/dump_syms_dwarf

check_SCRIPTS = \
src/tools/linux/dump_syms/dump_syms_test \
src/tools/windows/dump_syms_dwarf/dump_syms_dwarf_test

check_DEPS += \
src/tools/mac/dump_syms/dump_syms_mac

check_SCRIPTS += \
src/tools/mac/dump_syms/dump_syms_mac_test

endif !DISABLE_PROCESSOR


Expand Down Expand Up @@ -305,16 +320,19 @@ check_PROGRAMS += \
# src/tools/linux/symupload/minidump_upload \
# src/tools/linux/symupload/sym_upload

bin_PROGRAMS += \
src/tools/mac/dump_syms/dump_syms_mac

check_PROGRAMS += \
src/common/mac/macho_reader_unittest

if LINUX_HOST

bin_PROGRAMS += \
src/tools/linux/core2md/core2md \
src/tools/linux/pid2md/pid2md \
src/tools/linux/md2core/minidump-2-core

bin_PROGRAMS += \
src/tools/mac/dump_syms/dump_syms_mac

if HAVE_MEMFD_CREATE
libexec_PROGRAMS += \
src/tools/linux/core_handler/core_handler
Expand All @@ -323,9 +341,6 @@ endif
check_PROGRAMS += \
src/tools/linux/md2core/minidump_2_core_unittest

check_PROGRAMS += \
src/common/mac/macho_reader_unittest

endif LINUX_HOST

endif !DISABLE_TOOLS
Expand Down Expand Up @@ -781,8 +796,12 @@ src_tools_mac_dump_syms_dump_syms_mac_SOURCES = \
src/common/mac/macho_walker.cc \
src/common/mac/macho_walker.h \
src/tools/mac/dump_syms/dump_syms_tool.cc
src_tools_mac_dump_syms_dump_syms_mac_CXXFLAGS= \
-I$(top_srcdir)/src/third_party/mac_headers \
src_tools_mac_dump_syms_dump_syms_mac_CXXFLAGS =
if !MACOS_BUILD
src_tools_mac_dump_syms_dump_syms_mac_CXXFLAGS += \
-I$(top_srcdir)/src/third_party/mac_headers
endif
src_tools_mac_dump_syms_dump_syms_mac_CXXFLAGS += \
$(RUSTC_DEMANGLE_CFLAGS) \
-DHAVE_MACH_O_NLIST_H
src_tools_mac_dump_syms_dump_syms_mac_LDADD= \
Expand Down Expand Up @@ -905,8 +924,12 @@ src_common_mac_macho_reader_unittest_SOURCES = \
src/common/mac/macho_walker.cc \
src/common/tests/file_utils.cc
src_common_mac_macho_reader_unittest_CPPFLAGS = \
$(AM_CPPFLAGS) $(TEST_CFLAGS) \
-I$(top_srcdir)/src/third_party/mac_headers \
$(AM_CPPFLAGS) $(TEST_CFLAGS)
if !MACOS_BUILD
src_common_mac_macho_reader_unittest_CPPFLAGS += \
-I$(top_srcdir)/src/third_party/mac_headers
endif
src_common_mac_macho_reader_unittest_CPPFLAGS += \
-DHAVE_MACH_O_NLIST_H \
$(PTHREAD_CFLAGS)
src_common_mac_macho_reader_unittest_LDADD = \
Expand Down
13 changes: 5 additions & 8 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,17 @@ esac
AM_CONDITIONAL(ANDROID_HOST, test x$ANDROID_HOST = xtrue)

case $build_os in
darwin*)
MACOS_BUILD=true
;;
mingw* | msys* | cygwin*)
WINDOWS_BUILD=true
;;
esac

AM_CONDITIONAL(WINE_HOST, test x$WINDOWS_HOST = xtrue -a x$WINDOWS_BUILD != xtrue)
AM_CONDITIONAL(MACOS_BUILD, test x$MACOS_BUILD = xtrue)

# Some tools (like mac ones) only support x86 currently.
case $host_cpu in
i?86|x86_64)
X86_HOST=true
;;
esac
AM_CONDITIONAL(X86_HOST, test x$X86_HOST = xtrue)
AM_CONDITIONAL(WINE_HOST, test x$WINDOWS_HOST = xtrue -a x$WINDOWS_BUILD != xtrue)

AC_ARG_ENABLE(processor,
AS_HELP_STRING([--disable-processor],
Expand Down
11 changes: 10 additions & 1 deletion src/common/mac/byteswap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#ifndef COMMON_MAC_BYTESWAP_H_
#define COMMON_MAC_BYTESWAP_H_

#include "compat/linux.h"

#ifdef __APPLE__
#include <libkern/OSByteOrder.h>

Expand All @@ -45,12 +47,19 @@ static inline int16_t ByteSwap(int16_t v) { return OSSwapInt16(v); }
static inline int32_t ByteSwap(int32_t v) { return OSSwapInt32(v); }
static inline int64_t ByteSwap(int64_t v) { return OSSwapInt64(v); }

#elif defined(__linux__)
#else
// For NXByteOrder
#include <architecture/byte_order.h>
#include <stdint.h>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <stdlib.h>
#define bswap_16(x) __builtin_bswap16(x)
#define bswap_32(x) __builtin_bswap32(x)
#define bswap_64(x) __builtin_bswap64(x)
#else
#include <endian.h>
#include_next <byteswap.h>
#endif

static inline uint16_t ByteSwap(uint16_t v) { return bswap_16(v); }
static inline uint32_t ByteSwap(uint32_t v) { return bswap_32(v); }
Expand Down