Skip to content

Commit 7037ff9

Browse files
committed
Recognize AIX style archive kind
1 parent da48140 commit 7037ff9

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

+1
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ pub enum ArchiveKind {
552552
K_BSD,
553553
K_DARWIN,
554554
K_COFF,
555+
K_AIXBIG,
555556
}
556557

557558
// LLVMRustThinLTOData

compiler/rustc_codegen_llvm/src/llvm/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ impl FromStr for ArchiveKind {
137137
"bsd" => Ok(ArchiveKind::K_BSD),
138138
"darwin" => Ok(ArchiveKind::K_DARWIN),
139139
"coff" => Ok(ArchiveKind::K_COFF),
140+
"aix_big" => Ok(ArchiveKind::K_AIXBIG),
140141
_ => Err(()),
141142
}
142143
}

compiler/rustc_codegen_ssa/src/back/archive.rs

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ impl<'a> ArArchiveBuilder<'a> {
233233
"bsd" => ArchiveKind::Bsd,
234234
"darwin" => ArchiveKind::Darwin,
235235
"coff" => ArchiveKind::Coff,
236+
"aix_big" => ArchiveKind::AixBig,
236237
kind => {
237238
self.sess.emit_fatal(UnknownArchiveKind { kind });
238239
}

compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ enum class LLVMRustArchiveKind {
3939
BSD,
4040
DARWIN,
4141
COFF,
42+
AIX_BIG,
4243
};
4344

4445
static Archive::Kind fromRust(LLVMRustArchiveKind Kind) {
@@ -51,6 +52,8 @@ static Archive::Kind fromRust(LLVMRustArchiveKind Kind) {
5152
return Archive::K_DARWIN;
5253
case LLVMRustArchiveKind::COFF:
5354
return Archive::K_COFF;
55+
case LLVMRustArchiveKind::AIX_BIG:
56+
return Archive::K_AIXBIG;
5457
default:
5558
report_fatal_error("Bad ArchiveKind.");
5659
}

0 commit comments

Comments
 (0)