mirror of
https://codeberg.org/ziglang/zig.git
synced 2025-12-06 05:44:20 +00:00
tools: eliminate dependency on std.SegmentedList
This commit is contained in:
parent
164c598cd8
commit
4a38d783e8
1 changed files with 11 additions and 8 deletions
|
|
@ -1737,10 +1737,11 @@ fn processOneTarget(job: Job) void {
|
||||||
const collate_progress = progress_node.start("collating LLVM data", 0);
|
const collate_progress = progress_node.start("collating LLVM data", 0);
|
||||||
|
|
||||||
// So far, LLVM only has a few aliases for the same CPU.
|
// So far, LLVM only has a few aliases for the same CPU.
|
||||||
var cpu_aliases = std.StringHashMap(std.SegmentedList(struct {
|
const Alias = struct {
|
||||||
llvm: []const u8,
|
llvm: []const u8,
|
||||||
zig: []const u8,
|
zig: []const u8,
|
||||||
}, 4)).init(arena);
|
};
|
||||||
|
var cpu_aliases = std.StringHashMap(std.ArrayList(*Alias)).init(arena);
|
||||||
|
|
||||||
{
|
{
|
||||||
var it = root_map.iterator();
|
var it = root_map.iterator();
|
||||||
|
|
@ -1756,12 +1757,16 @@ fn processOneTarget(job: Job) void {
|
||||||
|
|
||||||
const gop = try cpu_aliases.getOrPut(try llvmNameToZigName(arena, llvm_name));
|
const gop = try cpu_aliases.getOrPut(try llvmNameToZigName(arena, llvm_name));
|
||||||
|
|
||||||
if (!gop.found_existing) gop.value_ptr.* = .{};
|
if (!gop.found_existing) {
|
||||||
|
gop.value_ptr.* = .empty;
|
||||||
|
}
|
||||||
|
|
||||||
try gop.value_ptr.append(arena, .{
|
const alias = try arena.create(Alias);
|
||||||
|
alias.* = .{
|
||||||
.llvm = llvm_alias,
|
.llvm = llvm_alias,
|
||||||
.zig = try llvmNameToZigName(arena, llvm_alias),
|
.zig = try llvmNameToZigName(arena, llvm_alias),
|
||||||
});
|
};
|
||||||
|
try gop.value_ptr.append(arena, alias);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1918,9 +1923,7 @@ fn processOneTarget(job: Job) void {
|
||||||
});
|
});
|
||||||
|
|
||||||
if (cpu_aliases.get(zig_name)) |aliases| {
|
if (cpu_aliases.get(zig_name)) |aliases| {
|
||||||
var alias_it = aliases.constIterator(0);
|
alias_it: for (aliases.items) |alias| {
|
||||||
|
|
||||||
alias_it: while (alias_it.next()) |alias| {
|
|
||||||
for (target.omit_cpus) |omit_cpu_name| {
|
for (target.omit_cpus) |omit_cpu_name| {
|
||||||
if (mem.eql(u8, omit_cpu_name, alias.llvm)) continue :alias_it;
|
if (mem.eql(u8, omit_cpu_name, alias.llvm)) continue :alias_it;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue