From d2402e3f0d91ef286b3f797ccf09cdeff382f68c Mon Sep 17 00:00:00 2001 From: Kai Luo Date: Tue, 12 Dec 2023 10:20:06 +0800 Subject: [PATCH 1/2] Add xcoff support --- library/std/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index f666b18887cb1..ef5647f6c1050 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -30,7 +30,7 @@ rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] } [target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies] miniz_oxide = { version = "0.7.0", optional = true, default-features = false } addr2line = { version = "0.21.0", optional = true, default-features = false } -object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] } +object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive'] } [dev-dependencies] rand = { version = "0.8.5", default-features = false, features = ["alloc"] } From 9f64023096eb23e1e937052a8ad75f6c4c88762b Mon Sep 17 00:00:00 2001 From: Kai Luo Date: Wed, 13 Dec 2023 10:15:27 +0800 Subject: [PATCH 2/2] Use different cfg for AIX --- library/std/Cargo.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index ef5647f6c1050..fe66788b564df 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -30,7 +30,12 @@ rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] } [target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies] miniz_oxide = { version = "0.7.0", optional = true, default-features = false } addr2line = { version = "0.21.0", optional = true, default-features = false } -object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive'] } + +[target.'cfg(all(not(target_os = "aix"), not(all(windows, target_env = "msvc", not(target_vendor = "uwp")))))'.dependencies] +object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] } + +[target.'cfg(target_os = "aix")'.dependencies] +object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'xcoff', 'unaligned', 'archive'] } [dev-dependencies] rand = { version = "0.8.5", default-features = false, features = ["alloc"] }