Commit fc55814faa8970cc373b7bbf8479c3bc3934fb44 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-08-12 10:43:24-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-08-12 10:48:54-07:00
log	fc55814faa8970cc373b7bbf8479c3bc3934fb44
tree	122369476b5b300a6dd2010f519bf734943c96b0
parent	6eecc4af99e2affc44d153e5f127200f2adf4642

compiler-rt: do not depend on `usingnamespace`

The idea is to depend on this language feature as little as possible
with the hopes that it can be adjusted to be less of an anti-pattern.
This also helps self-hosted, which does not yet implement
`usingnamespace`, get closer to being able to build compiler-rt.

19 files changed, 75 insertions(+), 21 deletions(-)

lib
- std
  - special
    compiler_rt.zig
  - target
    aarch64.zig
    amdgpu.zig
    arm.zig
    avr.zig
    bpf.zig
    hexagon.zig
    mips.zig
    msp430.zig
    nvptx.zig
    powerpc.zig
    riscv.zig
    sparc.zig
    spirv.zig
    systemz.zig
    ve.zig
    wasm.zig
    x86.zig
tools
- update_cpu_features.zig

lib/std/special/compiler_rt.zig+2-2

...	...	@@ -595,9 +595,9 @@ comptime {
595	595	@export(__muloti4, .{ .name = "__muloti4", .linkage = linkage });
596	596	const __mulodi4 = @import("compiler_rt/mulodi4.zig").__mulodi4;
597	597	@export(__mulodi4, .{ .name = "__mulodi4", .linkage = linkage });
598		}
599	598
600		pub usingnamespace @import("compiler_rt/atomics.zig");
	599	_ = @import("compiler_rt/atomics.zig");
	600	}
601	601
602	602	// Avoid dragging in the runtime safety mechanisms into this .o file,
603	603	// unless we're trying to test this file.

lib/std/target/aarch64.zig+4-1

...	...	@@ -171,7 +171,10 @@ pub const Feature = enum {
171	171	zcz_gp,
172	172	};
173	173
174		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	174	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	175	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	176	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	177	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
175	178
176	179	pub const all_features = blk: {
177	180	@setEvalBranchQuota(2000);

lib/std/target/amdgpu.zig+4-1

...	...	@@ -120,7 +120,10 @@ pub const Feature = enum {
120	120	xnack_support,
121	121	};
122	122
123		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	123	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	124	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	125	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	126	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
124	127
125	128	pub const all_features = blk: {
126	129	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/arm.zig+4-1

...	...	@@ -179,7 +179,10 @@ pub const Feature = enum {
179	179	zcz,
180	180	};
181	181
182		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	182	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	183	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	184	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	185	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
183	186
184	187	pub const all_features = blk: {
185	188	@setEvalBranchQuota(10000);

lib/std/target/avr.zig+4-1

...	...	@@ -41,7 +41,10 @@ pub const Feature = enum {
41	41	xmegau,
42	42	};
43	43
44		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	44	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	45	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	46	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	47	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
45	48
46	49	pub const all_features = blk: {
47	50	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/bpf.zig+4-1

...	...	@@ -10,7 +10,10 @@ pub const Feature = enum {
10	10	dwarfris,
11	11	};
12	12
13		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	13	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	14	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	15	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	16	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
14	17
15	18	pub const all_features = blk: {
16	19	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/hexagon.zig+4-1

...	...	@@ -38,7 +38,10 @@ pub const Feature = enum {
38	38	zreg,
39	39	};
40	40
41		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	41	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	42	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	43	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	44	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
42	45
43	46	pub const all_features = blk: {
44	47	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/mips.zig+4-1

...	...	@@ -59,7 +59,10 @@ pub const Feature = enum {
59	59	xgot,
60	60	};
61	61
62		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	62	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	63	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	64	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	65	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
63	66
64	67	pub const all_features = blk: {
65	68	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/msp430.zig+4-1

...	...	@@ -11,7 +11,10 @@ pub const Feature = enum {
11	11	hwmultf5,
12	12	};
13	13
14		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	14	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	15	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	16	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	17	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
15	18
16	19	pub const all_features = blk: {
17	20	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/nvptx.zig+4-1

...	...	@@ -35,7 +35,10 @@ pub const Feature = enum {
35	35	sm_80,
36	36	};
37	37
38		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	38	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	39	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	40	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	41	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
39	42
40	43	pub const all_features = blk: {
41	44	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/powerpc.zig+4-1

...	...	@@ -72,7 +72,10 @@ pub const Feature = enum {
72	72	vsx,
73	73	};
74	74
75		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	75	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	76	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	77	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	78	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
76	79
77	80	pub const all_features = blk: {
78	81	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/riscv.zig+4-1

...	...	@@ -64,7 +64,10 @@ pub const Feature = enum {
64	64	save_restore,
65	65	};
66	66
67		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	67	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	68	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	69	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	70	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
68	71
69	72	pub const all_features = blk: {
70	73	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/sparc.zig+4-1

...	...	@@ -26,7 +26,10 @@ pub const Feature = enum {
26	26	vis3,
27	27	};
28	28
29		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	29	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	30	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	31	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	32	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
30	33
31	34	pub const all_features = blk: {
32	35	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/spirv.zig+4-1

...	...	@@ -294,7 +294,10 @@ pub const Feature = enum {
294	294	LongConstantCompositeINTEL,
295	295	};
296	296
297		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	297	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	298	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	299	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	300	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
298	301
299	302	pub const all_features = blk: {
300	303	@setEvalBranchQuota(2000);

lib/std/target/systemz.zig+4-1

...	...	@@ -43,7 +43,10 @@ pub const Feature = enum {
43	43	vector_packed_decimal_enhancement,
44	44	};
45	45
46		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	46	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	47	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	48	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	49	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
47	50
48	51	pub const all_features = blk: {
49	52	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/ve.zig+4-1

...	...	@@ -8,7 +8,10 @@ pub const Feature = enum {
8	8	vpu,
9	9	};
10	10
11		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	11	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	12	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	13	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	14	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
12	15
13	16	pub const all_features = blk: {
14	17	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/wasm.zig+4-1

...	...	@@ -18,7 +18,10 @@ pub const Feature = enum {
18	18	unimplemented_simd128,
19	19	};
20	20
21		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	21	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	22	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	23	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	24	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
22	25
23	26	pub const all_features = blk: {
24	27	const len = @typeInfo(Feature).Enum.fields.len;

lib/std/target/x86.zig+5-2

...	...	@@ -147,7 +147,10 @@ pub const Feature = enum {
147	147	xsaves,
148	148	};
149	149
150		pub usingnamespace CpuFeature.feature_set_fns(Feature);
	150	pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	151	pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	152	pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	153	pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
151	154
152	155	pub const all_features = blk: {
153	156	const len = @typeInfo(Feature).Enum.fields.len;
...	...	@@ -2240,8 +2243,8 @@ pub const cpu = struct {
2240	2243	.features = featureSet(&[_]Feature{
2241	2244	.cx8,
2242	2245	.slow_unaligned_mem_16,
2243		.vzeroupper,
2244	2246	.soft_float,
	2247	.vzeroupper,
2245	2248	}),
2246	2249	};
2247	2250	pub const nehalem = CpuModel{

tools/update_cpu_features.zig+4-1

...	...	@@ -1066,7 +1066,10 @@ fn processOneTarget(job: Job) anyerror!void {
1066	1066	try w.writeAll(
1067	1067	\\};
1068	1068	\\
1069		\\pub usingnamespace CpuFeature.feature_set_fns(Feature);
	1069	\\pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
	1070	\\pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
	1071	\\pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
	1072	\\pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
1070	1073	\\
1071	1074	\\pub const all_features = blk: {
1072	1075	\\