diff options
| author | bors <bors@rust-lang.org> | 2021-08-31 19:33:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-31 19:33:06 +0000 |
| commit | 29ef6cf1637aa8317f8911f93f14e18d404c1b0e (patch) | |
| tree | adf7fe041af542aa044f78f976f77463e774c878 | |
| parent | 0a84708edca7c275cb99ad080317fbc7637516d8 (diff) | |
| parent | 84df1edad3f7fd7e410869616c68f4b5f8f882fb (diff) | |
| download | rust-29ef6cf1637aa8317f8911f93f14e18d404c1b0e.tar.gz rust-29ef6cf1637aa8317f8911f93f14e18d404c1b0e.zip | |
Auto merge of #88506 - Mark-Simulacrum:fix-rlibs, r=ehuss
Fix loading large rlibs Bumps object crate to permit parsing archives with 64-bit table entries. These are primarily encountered when there's more than 4GB of archive data. cc https://github.com/gimli-rs/object/issues/365 Helps with https://github.com/rust-lang/rust/issues/88351, but will also need a beta backport r? `@ehuss` (mostly for the test)
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/Cargo.toml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1dfe710ecee..f49c8515fca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2297,9 +2297,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c" +checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" dependencies = [ "compiler_builtins", "crc32fast", diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index 930b4dc4d41..1446624b881 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -36,6 +36,6 @@ rustc_target = { path = "../rustc_target" } rustc_session = { path = "../rustc_session" } [dependencies.object] -version = "0.26.1" +version = "0.26.2" default-features = false features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"] |