From 55e2b7e1b4606ae0bc684293f011b7006d1f1258 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 15 Jan 2016 19:24:50 +0300
Subject: [PATCH] libbacktrace: Reapply Rust-specific changes

New:
Fix for https://github.com/rust-lang/rust/issues/28447

Merged:
openbsd support: https://github.com/rust-lang/rust/commit/fcb30a0b67b1bd4acbc3422ff74fac5d031ae1ae
bitrig integration: https://github.com/rust-lang/rust/commit/cd8f31759fd04b9ce9c903fa00cae81dc5bba546

Not merged:
https://github.com/rust-lang/rust/commit/d4fc3ec208186f0a9de8d05a6802c95b07e058fd
@Diggsey says this change was unintended (https://github.com/rust-lang/rust/pull/30666#issuecomment-168616892)
---
 src/libbacktrace/configure | 4 ++--
 src/libbacktrace/ltmain.sh | 2 +-
 src/libbacktrace/pecoff.c  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libbacktrace/configure b/src/libbacktrace/configure
index 4e720e19f43..47df55c22d6 100755
--- a/src/libbacktrace/configure
+++ b/src/libbacktrace/configure
@@ -5691,7 +5691,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | bitrig*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       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
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | openbsd* | bitrig*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
diff --git a/src/libbacktrace/ltmain.sh b/src/libbacktrace/ltmain.sh
index 9503ec85d70..eaef55a5933 100644
--- a/src/libbacktrace/ltmain.sh
+++ b/src/libbacktrace/ltmain.sh
@@ -4741,7 +4741,7 @@ func_mode_link ()
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
diff --git a/src/libbacktrace/pecoff.c b/src/libbacktrace/pecoff.c
index c7d32aa6b47..31126cf4741 100644
--- a/src/libbacktrace/pecoff.c
+++ b/src/libbacktrace/pecoff.c
@@ -602,7 +602,7 @@ coff_add (struct backtrace_state *state, int descriptor,
   const b_coff_section_header *sects;
   struct backtrace_view str_view;
   int str_view_valid;
-  size_t str_size;
+  uint32_t str_size;
   off_t str_off;
   struct backtrace_view syms_view;
   off_t syms_off;