mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 08:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix zig build, ABI ABI, and update tests to new Target layout

Browse Source
This commit is contained in:
Andrew Kelley 2020-02-20 18:50:20 -05:00
parent 903127f36c
commit 2de7d0b10c
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
4 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/std/build.zig
View File

@ -1909,43 +1909,33 @@ pub const LibExeObjStep = struct {
try zig_args.append(self.target.zigTriple(builder.allocator) catch unreachable);
const all_features = self.target.getArch().allFeaturesList();
var populated_cpu_features = cross.cpu_features.cpu.features;
if (self.target.getArch().subArchFeature()) |sub_arch_index| {
populated_cpu_features.addFeature(sub_arch_index);
}
var populated_cpu_features = cross.cpu.model.features;
populated_cpu_features.populateDependencies(all_features);
if (populated_cpu_features.eql(cross.cpu_features.features)) {
if (populated_cpu_features.eql(cross.cpu.features)) {
// The CPU name alone is sufficient.
// If it is the baseline CPU, no command line args are required.
if (cross.cpu_features.cpu != self.target.getArch().getBaselineCpuFeatures().cpu) {
try zig_args.append("-target-cpu");
try zig_args.append(cross.cpu_features.cpu.name);
if (cross.cpu.model != Target.Cpu.baseline(self.target.getArch()).model) {
try zig_args.append("-mcpu");
try zig_args.append(cross.cpu.model.name);
}
} else {
try zig_args.append("-target-cpu");
try zig_args.append(cross.cpu_features.cpu.name);
var mcpu_buffer = try std.Buffer.init(builder.allocator, "-mcpu=");
try zig_args.append(cross.cpu.model.name);
try zig_args.append("-target-feature");
var feature_str_buffer = try std.Buffer.initSize(builder.allocator, 0);
for (all_features) |feature, i_usize| {
const i = @intCast(Target.Cpu.Feature.Set.Index, i_usize);
const in_cpu_set = populated_cpu_features.isEnabled(i);
const in_actual_set = cross.cpu_features.features.isEnabled(i);
const in_actual_set = cross.cpu.features.isEnabled(i);
if (in_cpu_set and !in_actual_set) {
try feature_str_buffer.appendByte('-');
try feature_str_buffer.append(feature.name);
try feature_str_buffer.appendByte(',');
try mcpu_buffer.appendByte('-');
try mcpu_buffer.append(feature.name);
} else if (!in_cpu_set and in_actual_set) {
try feature_str_buffer.appendByte('+');
try feature_str_buffer.append(feature.name);
try feature_str_buffer.appendByte(',');
try mcpu_buffer.appendByte('+');
try mcpu_buffer.append(feature.name);
}
}
if (mem.endsWith(u8, feature_str_buffer.toSliceConst(), ",")) {
feature_str_buffer.shrink(feature_str_buffer.len() - 1);
}
try zig_args.append(feature_str_buffer.toSliceConst());
try zig_args.append(mcpu_buffer.toSliceConst());
}
},
}

4
src-self-hosted/stage2.zig
View File

@ -930,7 +930,7 @@ const Stage2Target = extern struct {
const in_arch = in_target.arch - 1; // skip over ZigLLVM_UnknownArch
const in_sub_arch = in_target.sub_arch - 1; // skip over ZigLLVM_NoSubArch
const in_os = in_target.os;
const in_abi = in_target.abi - 1; // skip over ZigLLVM_UnknownEnvironment
const in_abi = in_target.abi;
return .{
.Cross = .{
@ -956,7 +956,7 @@ const Stage2Target = extern struct {
self.sub_arch = 0;
self.vendor = 0;
self.os = @enumToInt(target.getOs());
self.abi = @enumToInt(target.getAbi()) + 1; // skip over ZigLLVM_UnknownEnvironment
self.abi = @enumToInt(target.getAbi());
try initStage1TargetCpuFeatures(self, cpu);
}
};

3
test/compile_errors.zig
View File

@ -763,8 +763,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
});
tc.target = Target{
.Cross = .{
.arch = .x86_64,
.cpu_features = Target.Arch.x86_64.getBaselineCpuFeatures(),
.cpu = Target.Cpu.baseline(.x86_64),
.os = .linux,
.abi = .gnu,
},

24
test/translate_c.zig
View File

@ -1113,14 +1113,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\pub fn foo5(a: [*c]f32) callconv(.Thiscall) void;
});
cases.addWithTarget("Calling convention", tests.Target{
.Cross = .{
.os = .linux,
.arch = .{ .arm = .v8_5a },
.abi = .none,
.cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(),
},
},
cases.addWithTarget("Calling convention", Target.parse(.{
.arch_os_abi = "arm-linux-none",
.cpu_features = "generic+v8_5a",
}) catch unreachable,
\\void __attribute__((pcs("aapcs"))) foo1(float *a);
\\void __attribute__((pcs("aapcs-vfp"))) foo2(float *a);
, &[_][]const u8{
@ -1128,14 +1124,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
\\pub fn foo2(a: [*c]f32) callconv(.AAPCSVFP) void;
});
cases.addWithTarget("Calling convention", tests.Target{
.Cross = .{
.os = .linux,
.arch = .{ .aarch64 = .v8_5a },
.abi = .none,
.cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(),
},
},
cases.addWithTarget("Calling convention", Target.parse(.{
.arch_os_abi = "aarch64-linux-none",
.cpu_features = "generic+v8_5a",
}) catch unreachable,
\\void __attribute__((aarch64_vector_pcs)) foo1(float *a);
, &[_][]const u8{
\\pub fn foo1(a: [*c]f32) callconv(.Vectorcall) void;