Uclibc fixes

.github/workflows/main.yml

@@ -32,16 +32,16 @@ jobs:
           # on stable yet
           - thing: windows-msvc64
             os: windows-latest
-            rust: nightly-x86_64-msvc
+            rust: stable-x86_64-msvc
           - thing: windows-msvc32
             os: windows-latest
-            rust: nightly-i686-msvc
+            rust: stable-i686-msvc
           - thing: windows-gnu64
             os: windows-latest
-            rust: nightly-x86_64-gnu
+            rust: stable-x86_64-gnu
           - thing: windows-gnu32
             os: windows-latest
-            rust: nightly-i686-gnu
+            rust: stable-i686-gnu
     steps:
     - uses: actions/checkout@v1
       with:
@@ -59,28 +59,30 @@ jobs:
     - run: cargo build
     - run: cargo test
     - run: cargo test --features "gimli-symbolize"
+    - run: cargo test --features "libbacktrace"
+    - run: cargo test --features "libbacktrace gimli-symbolize"
+    - run: cargo test --features "serialize-rustc"
+    - run: cargo test --features "serialize-serde"
+    - run: cargo test --features "verify-winapi"
+    - run: cargo test --features "cpp_demangle"
     - run: cargo test --no-default-features
+    - run: cargo test --no-default-features --features "libbacktrace"
+    - run: cargo test --no-default-features --features "gimli-symbolize"
+    - run: cargo test --no-default-features --features "gimli-symbolize libbacktrace"
+    - run: cargo test --no-default-features --features "libbacktrace std"
+    - run: cargo test --no-default-features --features "gimli-symbolize std"
     - run: cargo test --no-default-features --features "std"
-    - run: cargo test --no-default-features --features "libunwind std"
-    - run: cargo test --no-default-features --features "libunwind dladdr std"
-    - run: cargo test --no-default-features --features "libunwind libbacktrace std"
-    - run: cargo test --no-default-features --features "libunwind libbacktrace dbghelp std"
-    - run: cargo test --no-default-features --features "libunwind coresymbolication dbghelp std"
-    - run: cargo test --no-default-features --features "libunwind coresymbolication dbghelp std libbacktrace"
-    - run: cargo test --no-default-features --features "unix-backtrace std"
-    - run: cargo test --no-default-features --features "unix-backtrace dladdr std"
-    - run: cargo test --no-default-features --features "unix-backtrace libbacktrace std"
-    - run: cargo test --no-default-features --features "unix-backtrace coresymbolication std"
-    - run: cargo test --no-default-features --features "serialize-serde std"
-    - run: cargo test --no-default-features --features "serialize-rustc std"
-    - run: cargo test --no-default-features --features "serialize-rustc serialize-serde std"
-    - run: cargo test --no-default-features --features "cpp_demangle std"
-    - run: cargo test --no-default-features --features "dbghelp std"
-    - run: cargo test --no-default-features --features "dbghelp std verify-winapi"
     - run: cargo test --manifest-path crates/cpp_smoke_test/Cargo.toml
+    - run: cargo test --manifest-path crates/macos_frames_test/Cargo.toml
     - run: cargo test --features libbacktrace --manifest-path crates/without_debuginfo/Cargo.toml
-    - run: cargo test --features "libbacktrace coresymbolication" --manifest-path crates/without_debuginfo/Cargo.toml
-    - run: cargo test --features "libbacktrace gimli-symbolize" --manifest-path crates/without_debuginfo/Cargo.toml
+    - run: cargo test --features gimli-symbolize --manifest-path crates/without_debuginfo/Cargo.toml
+    - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml --features libbacktrace
+    - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml --features gimli-symbolize
+    - run: RUSTFLAGS="-C link-arg=-Wl,--compress-debug-sections=zlib-gabi" cargo test --features gimli-symbolize
+      if: contains(matrix.os, 'ubuntu')
+    - run: RUSTFLAGS="-C link-arg=-Wl,--compress-debug-sections=zlib-gnu" cargo test --features gimli-symbolize
+      if: contains(matrix.os, 'ubuntu')
+    - run: cargo build --manifest-path crates/as-if-std/Cargo.toml
 
   windows_arm64:
     name: Windows AArch64
@@ -103,19 +105,10 @@ jobs:
       matrix:
         target:
         - aarch64-apple-ios
-        - armv7-apple-ios
-        - armv7s-apple-ios
-        - i386-apple-ios
         - x86_64-apple-ios
         include:
         - target: aarch64-apple-ios
           sdk: iphoneos
-        - target: armv7-apple-ios
-          sdk: iphoneos
-        - target: armv7s-apple-ios
-          sdk: iphoneos
-        - target: i386-apple-ios
-          sdk: iphonesimulator
         - target: x86_64-apple-ios
           sdk: iphonesimulator
     steps:
@@ -197,5 +190,5 @@ jobs:
       with:
         submodules: true
     - name: Install Rust
-      run: rustup update 1.32.0 && rustup default 1.32.0
+      run: rustup update 1.40.0 && rustup default 1.40.0
     - run: cargo build

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "backtrace-sys/src/libbacktrace"]
 	path = crates/backtrace-sys/src/libbacktrace
-	url = https://github.com/rust-lang-nursery/libbacktrace
+	url = https://github.com/rust-lang/libbacktrace

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "backtrace"
-version = "0.3.43"
+version = "0.3.50"
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -15,89 +15,62 @@ autotests = true
 edition = "2018"
 
 [workspace]
-members = ['crates/cpp_smoke_test']
-exclude = ['crates/without_debuginfo']
+members = ['crates/cpp_smoke_test', 'crates/as-if-std']
+exclude = ['crates/without_debuginfo', 'crates/macos_frames_test', 'crates/line-tables-only']
 
 [dependencies]
 cfg-if = "0.1.10"
 rustc-demangle = "0.1.4"
-backtrace-sys = { path = "crates/backtrace-sys", version = "0.1.32", optional = true }
+backtrace-sys = { path = "crates/backtrace-sys", version = "0.1.35", optional = true, default_features = false }
 libc = { version = "0.2.45", default-features = false }
-core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core' }
-compiler_builtins = { version = '0.1.2', optional = true }
 
-# Optionally enable the ability to serialize a `Backtrace`
+# Optionally enable the ability to serialize a `Backtrace`, controlled through
+# the `serialize-*` features below.
 serde = { version = "1.0", optional = true, features = ['derive'] }
 rustc-serialize = { version = "0.3", optional = true }
 
 # Optionally demangle C++ frames' symbols in backtraces.
-cpp_demangle = { default-features = false, version = "0.2.3", optional = true }
+cpp_demangle = { default-features = false, version = "0.3.0", optional = true }
 
-# Optional dependencies enabled through the `gimli-symbolize` feature
-addr2line = { version = "0.11.0", optional = true, default-features = false, features = ['std'] }
-findshlibs = { version = "0.5.0", optional = true }
-memmap = { version = "0.7.0", optional = true }
-goblin = { version = "0.1.3", optional = true, default-features = false, features = ['elf32', 'elf64', 'mach32', 'mach64', 'pe32', 'pe64', 'std'] }
+
+# Optional dependencies enabled through the `gimli-symbolize` feature, do not
+# use these features directly.
+addr2line = { version = "0.13.0", optional = true, default-features = false }
+miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
+[dependencies.object]
+version = "0.20.0"
+optional = true
+default-features = false
+features = ['read_core', 'elf', 'macho', 'pe', 'unaligned']
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.3", optional = true }
 
-# Each feature controls the two phases of finding a backtrace: getting a
-# backtrace and then resolving instruction pointers to symbols. The default
-# feature enables all the necessary features for each platform this library
-# supports, but it can be disabled to have finer grained control over the
-# dependencies.
-#
-# Note that not all features are available on all platforms, so even though a
-# feature is enabled some other feature may be used instead.
+[dev-dependencies]
+dylib-dep = { path = "crates/dylib-dep" }
+libloading = "0.6"
+
 [features]
-default = ["std", "libunwind", "libbacktrace", "dladdr", "dbghelp"]
+# By default libstd support and gimli-symbolize is used to symbolize addresses.
+default = ["std", "gimli-symbolize"]
 
-# Include std support.
+# Include std support. This enables types like `Backtrace`.
 std = []
 
-#=======================================
-# Methods of acquiring a backtrace
-#
-# - libunwind: when using this the libgcc library is linked against to get
-#   the unwinding support. This is generally the most reliable method to get
-#   a backtrace on unix.
-# - unix-backtrace: this uses the backtrace(3) function to acquire a
-#   backtrace, but is not as reliable as libunwind. It is, however,
-#   generally found in more locations.
-# - dbghelp: on windows this enables usage of dbghelp.dll to find a
-#   backtrace at runtime
-# - kernel32: on windows this enables using RtlCaptureStackBackTrace as the
-#   function to acquire a backtrace
-libunwind = []
-unix-backtrace = []
-dbghelp = []
-kernel32 = []
-
 #=======================================
 # Methods of resolving symbols
 #
-# - libbacktrace: this feature activates the `backtrace-sys` dependency,
-#   building the libbacktrace library found in gcc repos. This library
-#   parses the DWARF info of ELF executables to find symbol names, and it
-#   can also provide filename/line number information if debuginfo is
-#   compiled in. This library currently only primarily works on unixes that
-#   are not OSX, however.
-# - dladdr: this feature uses the dladdr(3) function (a glibc extension) to
-#   resolve symbol names. This is fairly unreliable on linux, but works well
-#   enough on OSX.
-# - coresymbolication: this feature uses the undocumented core symbolication
-#   framework on OS X to symbolize. Note that this is not turned on default due
-#   to various issues, you can see more in #202.
 # - gimli-symbolize: use the `gimli-rs/addr2line` crate to symbolicate
-#   addresses into file, line, and name using DWARF debug information. At
-#   the moment, this is only possible when targetting Linux, since macOS
-#   splits DWARF out into a separate object file. Enabling this feature
-#   means one less C dependency.
-libbacktrace = ["backtrace-sys"]
-dladdr = []
-coresymbolication = []
-gimli-symbolize = ["addr2line", "findshlibs", "memmap", "goblin"]
+#   addresses into file, line, and name using DWARF debug information.
+# - libbacktrace: this feature activates the `backtrace-sys` dependency,
+#   building the libbacktrace library found in gcc repos.
+#
+# Note that MSVC unconditionally uses the dbghelp library to symbolize and won't
+# be affected by feature selection here. Also note that it's highly unlikely you
+# want to configure this. If you're having trouble getting backtraces it's
+# likely best to open an issue.
+gimli-symbolize = ["addr2line", "miniz_oxide", "object"]
+libbacktrace = ["backtrace-sys/backtrace-sys"]
 
 #=======================================
 # Methods of serialization
@@ -107,25 +80,28 @@ serialize-rustc = ["rustc-serialize"]
 serialize-serde = ["serde"]
 
 #=======================================
-# Internal features for testing and such.
+# Deprecated/internal features
+#
+# Only here for backwards compatibility purposes or for internal testing
+# purposes. New code should use none of these features.
+coresymbolication = []
+dladdr = []
+kernel32 = []
+unix-backtrace = []
+libunwind = []
+dbghelp = []
 verify-winapi = [
   'winapi/dbghelp',
   'winapi/handleapi',
   'winapi/libloaderapi',
+  'winapi/memoryapi',
   'winapi/minwindef',
   'winapi/processthreadsapi',
   'winapi/synchapi',
+  'winapi/tlhelp32',
   'winapi/winbase',
   'winapi/winnt',
 ]
-rustc-dep-of-std = [
-  'backtrace-sys/rustc-dep-of-std',
-  'cfg-if/rustc-dep-of-std',
-  'core',
-  'compiler_builtins',
-  'libc/rustc-dep-of-std',
-  'rustc-demangle/rustc-dep-of-std',
-]
 
 [[example]]
 name = "backtrace"
@@ -150,7 +126,7 @@ edition = '2018'
 
 [[test]]
 name = "accuracy"
-required-features = ["std", "dbghelp", "libbacktrace", "libunwind"]
+required-features = ["std", "gimli-symbolize"]
 edition = '2018'
 
 [[test]]

README.md

@@ -14,18 +14,12 @@ backtrace like libstd's panics.
 backtrace = "0.3"
 ```
 
-Note that this crate requires `cc` and `ar` to be present on Unix systems when
-`libbacktrace` is used (which is the default). For configuring C compilers see
-the [`cc` crate documentation](https://github.com/alexcrichton/cc-rs).
-
 ## Usage
 
 To simply capture a backtrace and defer dealing with it until a later time,
 you can use the top-level `Backtrace` type.
 
 ```rust
-extern crate backtrace;
-
 use backtrace::Backtrace;
 
 fn main() {
@@ -41,8 +35,6 @@ If, however, you'd like more raw access to the actual tracing functionality, you
 can use the `trace` and `resolve` functions directly.
 
 ```rust
-extern crate backtrace;
-
 fn main() {
     backtrace::trace(|frame| {
         let ip = frame.ip();

benches/benchmarks.rs

@@ -2,8 +2,6 @@
 
 extern crate test;
 
-extern crate backtrace;
-
 #[cfg(feature = "std")]
 use backtrace::Backtrace;
 

ci/docker/aarch64-linux-android/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   curl \

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   ca-certificates \

ci/docker/arm-linux-androideabi/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   curl \
@@ -11,27 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh arm
-WORKDIR /android
-COPY android-sdk.sh /android/sdk.sh
-RUN ./sdk.sh arm
-RUN mv /root/.android /tmp
-RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
-ENV PATH=$PATH:/android-toolchain/bin:/android/sdk/platform-tools
+ENV PATH=$PATH:/android-toolchain/bin
 
 # TODO: run tests in an emulator eventually
 ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
-    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
-    HOME=/tmp
-
-ADD runtest-android.rs /tmp/runtest.rs
-ENTRYPOINT [ \
-  "bash", \
-  "-c", \
-  # set SHELL so android can detect a 64bits system, see
-  # http://stackoverflow.com/a/41789144
-  "SHELL=/bin/dash /android/sdk/emulator/emulator @arm -no-window & \
-   /rust/bin/rustc /tmp/runtest.rs -o /tmp/runtest && \
-   exec \"$@\"", \
-  "--" \
-]
+    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=echo

ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   ca-certificates \

ci/docker/armv7-linux-androideabi/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   curl \

ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   ca-certificates \

ci/docker/i586-unknown-linux-gnu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc-multilib \
   libc6-dev \

ci/docker/i686-linux-android/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   curl \