Skip to content

Commit d96cfd7

Browse files
poypoyanpoypoyan
authored
Merge branch 'master' into fieldenum-onefield
2 parents cdd32da + 61eff7b commit d96cfd7

File tree

538 files changed

+16331
-36215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

538 files changed

+16331
-36215
lines changed

‎CMakeLists.txt

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,18 @@ set(ZIG_STAGE2_SOURCES
387387
lib/std/Build.zig
388388
lib/std/Build/Cache.zig
389389
lib/std/Build/Cache/DepTokenizer.zig
390+
lib/std/Io.zig
391+
lib/std/Io/Reader.zig
392+
lib/std/Io/Writer.zig
393+
lib/std/Io/buffered_atomic_file.zig
394+
lib/std/Io/buffered_writer.zig
395+
lib/std/Io/change_detection_stream.zig
396+
lib/std/Io/counting_reader.zig
397+
lib/std/Io/counting_writer.zig
398+
lib/std/Io/find_byte_writer.zig
399+
lib/std/Io/fixed_buffer_stream.zig
400+
lib/std/Io/limited_reader.zig
401+
lib/std/Io/seekable_stream.zig
390402
lib/std/Progress.zig
391403
lib/std/Random.zig
392404
lib/std/Target.zig
@@ -436,7 +448,6 @@ set(ZIG_STAGE2_SOURCES
436448
lib/std/elf.zig
437449
lib/std/fifo.zig
438450
lib/std/fmt.zig
439-
lib/std/fmt/format_float.zig
440451
lib/std/fmt/parse_float.zig
441452
lib/std/fs.zig
442453
lib/std/fs/AtomicFile.zig
@@ -450,18 +461,6 @@ set(ZIG_STAGE2_SOURCES
450461
lib/std/hash_map.zig
451462
lib/std/heap.zig
452463
lib/std/heap/arena_allocator.zig
453-
lib/std/io.zig
454-
lib/std/io/Reader.zig
455-
lib/std/io/Writer.zig
456-
lib/std/io/buffered_atomic_file.zig
457-
lib/std/io/buffered_writer.zig
458-
lib/std/io/change_detection_stream.zig
459-
lib/std/io/counting_reader.zig
460-
lib/std/io/counting_writer.zig
461-
lib/std/io/find_byte_writer.zig
462-
lib/std/io/fixed_buffer_stream.zig
463-
lib/std/io/limited_reader.zig
464-
lib/std/io/seekable_stream.zig
465464
lib/std/json.zig
466465
lib/std/json/stringify.zig
467466
lib/std/leb128.zig
@@ -549,45 +548,6 @@ set(ZIG_STAGE2_SOURCES
549548
src/Value.zig
550549
src/Zcu.zig
551550
src/Zcu/PerThread.zig
552-
src/arch/aarch64/CodeGen.zig
553-
src/arch/aarch64/Emit.zig
554-
src/arch/aarch64/Mir.zig
555-
src/arch/aarch64/abi.zig
556-
src/arch/aarch64/bits.zig
557-
src/arch/arm/CodeGen.zig
558-
src/arch/arm/Emit.zig
559-
src/arch/arm/Mir.zig
560-
src/arch/arm/abi.zig
561-
src/arch/arm/bits.zig
562-
src/arch/powerpc/CodeGen.zig
563-
src/arch/riscv64/abi.zig
564-
src/arch/riscv64/bits.zig
565-
src/arch/riscv64/CodeGen.zig
566-
src/arch/riscv64/Emit.zig
567-
src/arch/riscv64/encoding.zig
568-
src/arch/riscv64/Lower.zig
569-
src/arch/riscv64/Mir.zig
570-
src/arch/riscv64/mnem.zig
571-
src/arch/sparc64/CodeGen.zig
572-
src/arch/sparc64/Emit.zig
573-
src/arch/sparc64/Mir.zig
574-
src/arch/sparc64/abi.zig
575-
src/arch/sparc64/bits.zig
576-
src/arch/wasm/CodeGen.zig
577-
src/arch/wasm/Emit.zig
578-
src/arch/wasm/Mir.zig
579-
src/arch/wasm/abi.zig
580-
src/arch/x86/bits.zig
581-
src/arch/x86_64/CodeGen.zig
582-
src/arch/x86_64/Disassembler.zig
583-
src/arch/x86_64/Emit.zig
584-
src/arch/x86_64/Encoding.zig
585-
src/arch/x86_64/Lower.zig
586-
src/arch/x86_64/Mir.zig
587-
src/arch/x86_64/abi.zig
588-
src/arch/x86_64/bits.zig
589-
src/arch/x86_64/encoder.zig
590-
src/arch/x86_64/encodings.zon
591551
src/clang.zig
592552
src/clang_options.zig
593553
src/clang_options_data.zig

‎build.zig

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ pub fn build(b: *std.Build) !void {
279279

280280
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
281281
if (zig_version.order(ancestor_ver) != .gt) {
282-
std.debug.print("Zig version '{}' must be greater than tagged ancestor '{}'\n", .{ zig_version, ancestor_ver });
282+
std.debug.print("Zig version '{f}' must be greater than tagged ancestor '{f}'\n", .{ zig_version, ancestor_ver });
283283
std.process.exit(1);
284284
}
285285

@@ -415,7 +415,18 @@ pub fn build(b: *std.Build) !void {
415415
test_step.dependOn(check_fmt);
416416

417417
const test_cases_step = b.step("test-cases", "Run the main compiler test cases");
418-
try tests.addCases(b, test_cases_step, test_filters, test_target_filters, target, .{
418+
try tests.addCases(b, test_cases_step, target, .{
419+
.test_filters = test_filters,
420+
.test_target_filters = test_target_filters,
421+
.skip_non_native = skip_non_native,
422+
.skip_freebsd = skip_freebsd,
423+
.skip_netbsd = skip_netbsd,
424+
.skip_windows = skip_windows,
425+
.skip_macos = skip_macos,
426+
.skip_linux = skip_linux,
427+
.skip_llvm = skip_llvm,
428+
.skip_libc = skip_libc,
429+
}, .{
419430
.skip_translate_c = skip_translate_c,
420431
.skip_run_translated_c = skip_run_translated_c,
421432
}, .{
@@ -439,6 +450,7 @@ pub fn build(b: *std.Build) !void {
439450
.desc = "Run the behavior tests",
440451
.optimize_modes = optimization_modes,
441452
.include_paths = &.{},
453+
.windows_libs = &.{},
442454
.skip_single_threaded = skip_single_threaded,
443455
.skip_non_native = skip_non_native,
444456
.skip_freebsd = skip_freebsd,
@@ -448,8 +460,8 @@ pub fn build(b: *std.Build) !void {
448460
.skip_linux = skip_linux,
449461
.skip_llvm = skip_llvm,
450462
.skip_libc = skip_libc,
451-
// 2923515904 was observed on an x86_64-linux-gnu host.
452-
.max_rss = 3100000000,
463+
// 3888779264 was observed on an x86_64-linux-gnu host.
464+
.max_rss = 4000000000,
453465
}));
454466

455467
test_modules_step.dependOn(tests.addModuleTests(b, .{
@@ -461,6 +473,7 @@ pub fn build(b: *std.Build) !void {
461473
.desc = "Run the @cImport tests",
462474
.optimize_modes = optimization_modes,
463475
.include_paths = &.{"test/c_import"},
476+
.windows_libs = &.{},
464477
.skip_single_threaded = true,
465478
.skip_non_native = skip_non_native,
466479
.skip_freebsd = skip_freebsd,
@@ -481,6 +494,7 @@ pub fn build(b: *std.Build) !void {
481494
.desc = "Run the compiler_rt tests",
482495
.optimize_modes = optimization_modes,
483496
.include_paths = &.{},
497+
.windows_libs = &.{},
484498
.skip_single_threaded = true,
485499
.skip_non_native = skip_non_native,
486500
.skip_freebsd = skip_freebsd,
@@ -502,6 +516,7 @@ pub fn build(b: *std.Build) !void {
502516
.desc = "Run the zigc tests",
503517
.optimize_modes = optimization_modes,
504518
.include_paths = &.{},
519+
.windows_libs = &.{},
505520
.skip_single_threaded = true,
506521
.skip_non_native = skip_non_native,
507522
.skip_freebsd = skip_freebsd,
@@ -523,6 +538,12 @@ pub fn build(b: *std.Build) !void {
523538
.desc = "Run the standard library tests",
524539
.optimize_modes = optimization_modes,
525540
.include_paths = &.{},
541+
.windows_libs = &.{
542+
"advapi32",
543+
"crypt32",
544+
"iphlpapi",
545+
"ws2_32",
546+
},
526547
.skip_single_threaded = skip_single_threaded,
527548
.skip_non_native = skip_non_native,
528549
.skip_freebsd = skip_freebsd,
@@ -720,6 +741,12 @@ fn addCompilerMod(b: *std.Build, options: AddCompilerModOptions) *std.Build.Modu
720741
compiler_mod.addImport("aro", aro_mod);
721742
compiler_mod.addImport("aro_translate_c", aro_translate_c_mod);
722743

744+
if (options.target.result.os.tag == .windows) {
745+
compiler_mod.linkSystemLibrary("advapi32", .{});
746+
compiler_mod.linkSystemLibrary("crypt32", .{});
747+
compiler_mod.linkSystemLibrary("ws2_32", .{});
748+
}
749+
723750
return compiler_mod;
724751
}
725752

@@ -1417,8 +1444,12 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {
14171444
}),
14181445
});
14191446

1447+
if (b.graph.host.result.os.tag == .windows) {
1448+
doctest_exe.root_module.linkSystemLibrary("advapi32", .{});
1449+
}
1450+
14201451
var dir = b.build_root.handle.openDir("doc/langref", .{ .iterate = true }) catch |err| {
1421-
std.debug.panic("unable to open '{}doc/langref' directory: {s}", .{
1452+
std.debug.panic("unable to open '{f}doc/langref' directory: {s}", .{
14221453
b.build_root, @errorName(err),
14231454
});
14241455
};
@@ -1439,7 +1470,7 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {
14391470
// in a temporary directory
14401471
"--cache-root", b.cache_root.path orelse ".",
14411472
});
1442-
cmd.addArgs(&.{ "--zig-lib-dir", b.fmt("{}", .{b.graph.zig_lib_directory}) });
1473+
cmd.addArgs(&.{ "--zig-lib-dir", b.fmt("{f}", .{b.graph.zig_lib_directory}) });
14431474
cmd.addArgs(&.{"-i"});
14441475
cmd.addFileArg(b.path(b.fmt("doc/langref/{s}", .{entry.name})));
14451476

‎ci/x86_64-linux-debug-llvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.15.0-dev.233+7c85dc460"
1212
PREFIX="$HOME/deps/$CACHE_BASENAME"
1313
ZIG="$PREFIX/bin/zig"
1414

15-
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.2.0-rc1/bin:$HOME/local/bin:$PATH"
15+
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.0.2/bin:$HOME/local/bin:$PATH"
1616

1717
# Make the `zig version` number consistent.
1818
# This will affect the cmake command below.

‎ci/x86_64-linux-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.15.0-dev.233+7c85dc460"
1212
PREFIX="$HOME/deps/$CACHE_BASENAME"
1313
ZIG="$PREFIX/bin/zig"
1414

15-
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.2.0-rc1/bin:$HOME/local/bin:$PATH"
15+
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.0.2/bin:$HOME/local/bin:$PATH"
1616

1717
# Make the `zig version` number consistent.
1818
# This will affect the cmake command below.

‎ci/x86_64-linux-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.15.0-dev.233+7c85dc460"
1212
PREFIX="$HOME/deps/$CACHE_BASENAME"
1313
ZIG="$PREFIX/bin/zig"
1414

15-
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.2.0-rc1/bin:$HOME/local/bin:$PATH"
15+
export PATH="$HOME/deps/wasmtime-v29.0.0-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-10.0.2/bin:$HOME/local/bin:$PATH"
1616

1717
# Make the `zig version` number consistent.
1818
# This will affect the cmake command below.

0 commit comments

Comments
 (0)