Skip to content

Commit 55e2b7e

Browse files
committed
libbacktrace: Reapply Rust-specific changes
New: Fix for #28447 Merged: openbsd support: fcb30a0 bitrig integration: cd8f317 Not merged: d4fc3ec @Diggsey says this change was unintended (#30666 (comment))
1 parent 5f57121 commit 55e2b7e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/libbacktrace/configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -5691,7 +5691,7 @@ else
56915691
lt_cv_sys_max_cmd_len=8192;
56925692
;;
56935693
5694-
netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
5694+
netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | bitrig*)
56955695
# This has been around since 386BSD, at least. Likely further.
56965696
if test -x /sbin/sysctl; then
56975697
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -9374,7 +9374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
93749374
;;
93759375
93769376
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
9377-
freebsd* | dragonfly*)
9377+
freebsd* | dragonfly* | openbsd* | bitrig*)
93789378
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
93799379
hardcode_libdir_flag_spec='-R$libdir'
93809380
hardcode_direct=yes

src/libbacktrace/ltmain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4741,7 +4741,7 @@ func_mode_link ()
47414741
# These systems don't actually have a C library (as such)
47424742
test "X$arg" = "X-lc" && continue
47434743
;;
4744-
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
4744+
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
47454745
# Do not include libc due to us having libc/libc_r.
47464746
test "X$arg" = "X-lc" && continue
47474747
;;

src/libbacktrace/pecoff.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ coff_add (struct backtrace_state *state, int descriptor,
602602
const b_coff_section_header *sects;
603603
struct backtrace_view str_view;
604604
int str_view_valid;
605-
size_t str_size;
605+
uint32_t str_size;
606606
off_t str_off;
607607
struct backtrace_view syms_view;
608608
off_t syms_off;

0 commit comments

Comments
 (0)