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 {
     @export(__muloti4, .{ .name = "__muloti4", .linkage = linkage });
     const __mulodi4 = @import("compiler_rt/mulodi4.zig").__mulodi4;
     @export(__mulodi4, .{ .name = "__mulodi4", .linkage = linkage });
-}
-pub usingnamespace @import("compiler_rt/atomics.zig");
+    _ = @import("compiler_rt/atomics.zig");
+}
 // Avoid dragging in the runtime safety mechanisms into this .o file,
 // unless we're trying to test this file.

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

 @@ -171,7 +171,10 @@ pub const Feature = enum {
     zcz_gp,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     @setEvalBranchQuota(2000);

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

 @@ -120,7 +120,10 @@ pub const Feature = enum {
     xnack_support,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -179,7 +179,10 @@ pub const Feature = enum {
     zcz,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     @setEvalBranchQuota(10000);

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

 @@ -41,7 +41,10 @@ pub const Feature = enum {
     xmegau,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -10,7 +10,10 @@ pub const Feature = enum {
     dwarfris,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -38,7 +38,10 @@ pub const Feature = enum {
     zreg,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -59,7 +59,10 @@ pub const Feature = enum {
     xgot,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -11,7 +11,10 @@ pub const Feature = enum {
     hwmultf5,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -35,7 +35,10 @@ pub const Feature = enum {
     sm_80,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -72,7 +72,10 @@ pub const Feature = enum {
     vsx,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -64,7 +64,10 @@ pub const Feature = enum {
     save_restore,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -26,7 +26,10 @@ pub const Feature = enum {
     vis3,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -294,7 +294,10 @@ pub const Feature = enum {
     LongConstantCompositeINTEL,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     @setEvalBranchQuota(2000);

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

 @@ -43,7 +43,10 @@ pub const Feature = enum {
     vector_packed_decimal_enhancement,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

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

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

 @@ -18,7 +18,10 @@ pub const Feature = enum {
     unimplemented_simd128,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;

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

 @@ -147,7 +147,10 @@ pub const Feature = enum {
     xsaves,
 };
-pub usingnamespace CpuFeature.feature_set_fns(Feature);
+pub const featureSet = CpuFeature.feature_set_fns(Feature).featureSet;
+pub const featureSetHas = CpuFeature.feature_set_fns(Feature).featureSetHas;
+pub const featureSetHasAny = CpuFeature.feature_set_fns(Feature).featureSetHasAny;
+pub const featureSetHasAll = CpuFeature.feature_set_fns(Feature).featureSetHasAll;
 pub const all_features = blk: {
     const len = @typeInfo(Feature).Enum.fields.len;
 @@ -2240,8 +2243,8 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .cx8,
             .slow_unaligned_mem_16,
-            .vzeroupper,
             .soft_float,
+            .vzeroupper,
         }),
     };
     pub const nehalem = CpuModel{

tools/update_cpu_features.zig+4-1

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