| author |  Andrew Kelley <andrew@ziglang.org> 2020-02-20 18:50:20-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-02-20 18:50:20-05:00 |
| log | 2de7d0b10c29442f556654b61d0c5c4a53047a09 |
| tree | a8a240d583ff470597a7de81af294487058f0cd5 |
| parent | 903127f36cf995d251a474438d3ecc6c6e0e30d2 |
| signature |  Commit is signed but in an unrecognized format. |
fix zig build, ABI ABI, and update tests to new Target layout
4 files changed, 24 insertions(+), 43 deletions(-)
lib- std
- src-self-hosted
lib/std/build.zig+13-23
| ... | @@ -1909,43 +1909,33 @@ pub const LibExeObjStep = struct { | ... | @@ -1909,43 +1909,33 @@ pub const LibExeObjStep = struct { |
| 1909 | try zig_args.append(self.target.zigTriple(builder.allocator) catch unreachable); | 1909 | try zig_args.append(self.target.zigTriple(builder.allocator) catch unreachable); |
| 1910 | 1910 | ||
| 1911 | const all_features = self.target.getArch().allFeaturesList(); | 1911 | const all_features = self.target.getArch().allFeaturesList(); |
| 1912 | var populated_cpu_features = cross.cpu_features.cpu.features; | 1912 | var populated_cpu_features = cross.cpu.model.features; |
| 1913 | if (self.target.getArch().subArchFeature()) |sub_arch_index| { | ||
| 1914 | populated_cpu_features.addFeature(sub_arch_index); | ||
| 1915 | } | ||
| 1916 | populated_cpu_features.populateDependencies(all_features); | 1913 | populated_cpu_features.populateDependencies(all_features); |
| 1917 | 1914 | ||
| 1918 | if (populated_cpu_features.eql(cross.cpu_features.features)) { | 1915 | if (populated_cpu_features.eql(cross.cpu.features)) { |
| 1919 | // The CPU name alone is sufficient. | 1916 | // The CPU name alone is sufficient. |
| 1920 | // If it is the baseline CPU, no command line args are required. | 1917 | // If it is the baseline CPU, no command line args are required. |
| 1921 | if (cross.cpu_features.cpu != self.target.getArch().getBaselineCpuFeatures().cpu) { | 1918 | if (cross.cpu.model != Target.Cpu.baseline(self.target.getArch()).model) { |
| 1922 | try zig_args.append("-target-cpu"); | 1919 | try zig_args.append("-mcpu"); |
| 1923 | try zig_args.append(cross.cpu_features.cpu.name); | 1920 | try zig_args.append(cross.cpu.model.name); |
| 1924 | } | 1921 | } |
| 1925 | } else { | 1922 | } else { |
| 1926 | try zig_args.append("-target-cpu"); | 1923 | var mcpu_buffer = try std.Buffer.init(builder.allocator, "-mcpu="); |
| 1927 | try zig_args.append(cross.cpu_features.cpu.name); | 1924 | try zig_args.append(cross.cpu.model.name); |
| 1928 | 1925 | ||
| 1929 | try zig_args.append("-target-feature"); | ||
| 1930 | var feature_str_buffer = try std.Buffer.initSize(builder.allocator, 0); | ||
| 1931 | for (all_features) |feature, i_usize| { | 1926 | for (all_features) |feature, i_usize| { |
| 1932 | const i = @intCast(Target.Cpu.Feature.Set.Index, i_usize); | 1927 | const i = @intCast(Target.Cpu.Feature.Set.Index, i_usize); |
| 1933 | const in_cpu_set = populated_cpu_features.isEnabled(i); | 1928 | const in_cpu_set = populated_cpu_features.isEnabled(i); |
| 1934 | const in_actual_set = cross.cpu_features.features.isEnabled(i); | 1929 | const in_actual_set = cross.cpu.features.isEnabled(i); |
| 1935 | if (in_cpu_set and !in_actual_set) { | 1930 | if (in_cpu_set and !in_actual_set) { |
| 1936 | try feature_str_buffer.appendByte('-'); | 1931 | try mcpu_buffer.appendByte('-'); |
| 1937 | try feature_str_buffer.append(feature.name); | 1932 | try mcpu_buffer.append(feature.name); |
| 1938 | try feature_str_buffer.appendByte(','); | ||
| 1939 | } else if (!in_cpu_set and in_actual_set) { | 1933 | } else if (!in_cpu_set and in_actual_set) { |
| 1940 | try feature_str_buffer.appendByte('+'); | 1934 | try mcpu_buffer.appendByte('+'); |
| 1941 | try feature_str_buffer.append(feature.name); | 1935 | try mcpu_buffer.append(feature.name); |
| 1942 | try feature_str_buffer.appendByte(','); | ||
| 1943 | } | 1936 | } |
| 1944 | } | 1937 | } |
| 1945 | if (mem.endsWith(u8, feature_str_buffer.toSliceConst(), ",")) { | 1938 | try zig_args.append(mcpu_buffer.toSliceConst()); |
| 1946 | feature_str_buffer.shrink(feature_str_buffer.len() - 1); | ||
| 1947 | } | ||
| 1948 | try zig_args.append(feature_str_buffer.toSliceConst()); | ||
| 1949 | } | 1939 | } |
| 1950 | }, | 1940 | }, |
| 1951 | } | 1941 | } |
src-self-hosted/stage2.zig+2-2
| ... | @@ -930,7 +930,7 @@ const Stage2Target = extern struct { | ... | @@ -930,7 +930,7 @@ const Stage2Target = extern struct { |
| 930 | const in_arch = in_target.arch - 1; // skip over ZigLLVM_UnknownArch | 930 | const in_arch = in_target.arch - 1; // skip over ZigLLVM_UnknownArch |
| 931 | const in_sub_arch = in_target.sub_arch - 1; // skip over ZigLLVM_NoSubArch | 931 | const in_sub_arch = in_target.sub_arch - 1; // skip over ZigLLVM_NoSubArch |
| 932 | const in_os = in_target.os; | 932 | const in_os = in_target.os; |
| 933 | const in_abi = in_target.abi - 1; // skip over ZigLLVM_UnknownEnvironment | 933 | const in_abi = in_target.abi; |
| 934 | 934 | ||
| 935 | return .{ | 935 | return .{ |
| 936 | .Cross = .{ | 936 | .Cross = .{ |
| ... | @@ -956,7 +956,7 @@ const Stage2Target = extern struct { | ... | @@ -956,7 +956,7 @@ const Stage2Target = extern struct { |
| 956 | self.sub_arch = 0; | 956 | self.sub_arch = 0; |
| 957 | self.vendor = 0; | 957 | self.vendor = 0; |
| 958 | self.os = @enumToInt(target.getOs()); | 958 | self.os = @enumToInt(target.getOs()); |
| 959 | self.abi = @enumToInt(target.getAbi()) + 1; // skip over ZigLLVM_UnknownEnvironment | 959 | self.abi = @enumToInt(target.getAbi()); |
| 960 | try initStage1TargetCpuFeatures(self, cpu); | 960 | try initStage1TargetCpuFeatures(self, cpu); |
| 961 | } | 961 | } |
| 962 | }; | 962 | }; |
test/compile_errors.zig+1-2
| ... | @@ -763,8 +763,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void { | ... | @@ -763,8 +763,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void { |
| 763 | }); | 763 | }); |
| 764 | tc.target = Target{ | 764 | tc.target = Target{ |
| 765 | .Cross = .{ | 765 | .Cross = .{ |
| 766 | .arch = .x86_64, | 766 | .cpu = Target.Cpu.baseline(.x86_64), |
| 767 | .cpu_features = Target.Arch.x86_64.getBaselineCpuFeatures(), | ||
| 768 | .os = .linux, | 767 | .os = .linux, |
| 769 | .abi = .gnu, | 768 | .abi = .gnu, |
| 770 | }, | 769 | }, |
test/translate_c.zig+8-16
| ... | @@ -1113,14 +1113,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void { | ... | @@ -1113,14 +1113,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void { |
| 1113 | \\pub fn foo5(a: [*c]f32) callconv(.Thiscall) void; | 1113 | \\pub fn foo5(a: [*c]f32) callconv(.Thiscall) void; |
| 1114 | }); | 1114 | }); |
| 1115 | 1115 | ||
| 1116 | cases.addWithTarget("Calling convention", tests.Target{ | 1116 | cases.addWithTarget("Calling convention", Target.parse(.{ |
| 1117 | .Cross = .{ | 1117 | .arch_os_abi = "arm-linux-none", |
| 1118 | .os = .linux, | 1118 | .cpu_features = "generic+v8_5a", |
| 1119 | .arch = .{ .arm = .v8_5a }, | 1119 | }) catch unreachable, |
| 1120 | .abi = .none, | ||
| 1121 | .cpu_features = (Target.Arch{ .arm = .v8_5a }).getBaselineCpuFeatures(), | ||
| 1122 | }, | ||
| 1123 | }, | ||
| 1124 | \\void __attribute__((pcs("aapcs"))) foo1(float *a); | 1120 | \\void __attribute__((pcs("aapcs"))) foo1(float *a); |
| 1125 | \\void __attribute__((pcs("aapcs-vfp"))) foo2(float *a); | 1121 | \\void __attribute__((pcs("aapcs-vfp"))) foo2(float *a); |
| 1126 | , &[_][]const u8{ | 1122 | , &[_][]const u8{ |
| ... | @@ -1128,14 +1124,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void { | ... | @@ -1128,14 +1124,10 @@ pub fn addCases(cases: *tests.TranslateCContext) void { |
| 1128 | \\pub fn foo2(a: [*c]f32) callconv(.AAPCSVFP) void; | 1124 | \\pub fn foo2(a: [*c]f32) callconv(.AAPCSVFP) void; |
| 1129 | }); | 1125 | }); |
| 1130 | 1126 | ||
| 1131 | cases.addWithTarget("Calling convention", tests.Target{ | 1127 | cases.addWithTarget("Calling convention", Target.parse(.{ |
| 1132 | .Cross = .{ | 1128 | .arch_os_abi = "aarch64-linux-none", |
| 1133 | .os = .linux, | 1129 | .cpu_features = "generic+v8_5a", |
| 1134 | .arch = .{ .aarch64 = .v8_5a }, | 1130 | }) catch unreachable, |
| 1135 | .abi = .none, | ||
| 1136 | .cpu_features = (Target.Arch{ .aarch64 = .v8_5a }).getBaselineCpuFeatures(), | ||
| 1137 | }, | ||
| 1138 | }, | ||
| 1139 | \\void __attribute__((aarch64_vector_pcs)) foo1(float *a); | 1131 | \\void __attribute__((aarch64_vector_pcs)) foo1(float *a); |
| 1140 | , &[_][]const u8{ | 1132 | , &[_][]const u8{ |
| 1141 | \\pub fn foo1(a: [*c]f32) callconv(.Vectorcall) void; | 1133 | \\pub fn foo1(a: [*c]f32) callconv(.Vectorcall) void; |