From 6363e1701f2cabf66556354e87207a5825527cbb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 26 Sep 2024 06:03:28 +0900 Subject: [PATCH] Import patches for old macOS from MacPorts --- .gdbinit | 5 +++-- signal.c | 3 ++- vm_dump.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gdbinit b/.gdbinit index 1b5b6cb5621ff5..911624d8c9b737 100644 --- a/.gdbinit +++ b/.gdbinit @@ -1,5 +1,3 @@ -set startup-with-shell off - define hook-run set $color_type = 0 set $color_highlite = 0 @@ -1345,3 +1343,6 @@ define print_flags end source -s misc/gdb.py + +# Moved from beginning, since it fails on older gdbs +set startup-with-shell off diff --git a/signal.c b/signal.c index 1c8f8c112b73ba..2f7796c127712d 100644 --- a/signal.c +++ b/signal.c @@ -803,7 +803,8 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx) const greg_t bp = mctx->gregs[REG_EBP]; # endif # elif defined __APPLE__ -# if __DARWIN_UNIX03 +# include +# if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 # define MCTX_SS_REG(reg) __ss.__##reg # else # define MCTX_SS_REG(reg) ss.reg diff --git a/vm_dump.c b/vm_dump.c index 444be4a4f3c300..dcf0ec4c6e84c0 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errout, VALUE self) } #if defined __APPLE__ -# if __DARWIN_UNIX03 +# include +# if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 # define MCTX_SS_REG(reg) __ss.__##reg # else # define MCTX_SS_REG(reg) ss.reg @@ -502,7 +503,8 @@ rb_vmdebug_thread_dump_state(FILE *errout, VALUE self) # ifdef HAVE_LIBUNWIND # undef backtrace # define backtrace unw_backtrace -# elif defined(__APPLE__) && defined(HAVE_LIBUNWIND_H) +# elif defined(__APPLE__) && defined(HAVE_LIBUNWIND_H) \ + && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 # define UNW_LOCAL_ONLY # include # include