Skip to content

Commit 5d60366

Browse files
committed
1 parent 72c6261 commit 5d60366

File tree

2,035 files changed

+70782
-75926
lines changed

Some content is hidden

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

2,035 files changed

+70782
-75926
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ to find and inspect the patch diffs.
2222
* LLVM, LLD, Clang 19.1.2 ([espressif fork](https://github.com/espressif/llvm-project))
2323
* zlib 1.3.1
2424
* zstd 1.5.2
25-
* zig 0.14.0-dev
25+
* zig 0.14.0
2626

2727
For other versions, check the git tags of this repository.
2828

build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TARGET="$1" # Example: riscv64-linux-gnu
77
MCPU="$2" # Examples: `baseline`, `native`, `generic+v7a`, or `arm1176jzf_s`
88

99
ROOTDIR="$(pwd)"
10-
ZIG_VERSION="0.14.0-dev.xtensa.3412+81cdb488c"
10+
ZIG_VERSION="0.14.0-xtensa"
1111

1212
TARGET_OS_AND_ABI=${TARGET#*-} # Example: linux-gnu
1313

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if "%VSCMD_ARG_HOST_ARCH%"=="x86" set OUTDIR=out-win-x86
3535

3636
set ROOTDIR=%~dp0
3737
set "ROOTDIR_CMAKE=%ROOTDIR:\=/%"
38-
set ZIG_VERSION="0.14.0-dev.xtensa.3412+81cdb488c"
38+
set ZIG_VERSION="0.14.0-xtensa"
3939
set JOBS_ARG=
4040

4141
pushd %ROOTDIR%

zig/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ project(zig
3838
)
3939

4040
set(ZIG_VERSION_MAJOR 0)
41-
set(ZIG_VERSION_MINOR 14)
41+
set(ZIG_VERSION_MINOR 15)
4242
set(ZIG_VERSION_PATCH 0)
4343
set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find out with git.")
4444

@@ -500,6 +500,11 @@ set(ZIG_STAGE2_SOURCES
500500
lib/std/zig/system/NativePaths.zig
501501
lib/std/zig/system/x86.zig
502502
lib/std/zig/tokenizer.zig
503+
lib/std/zig/llvm.zig
504+
lib/std/zig/llvm/BitcodeReader.zig
505+
lib/std/zig/llvm/Builder.zig
506+
lib/std/zig/llvm/bitcode_writer.zig
507+
lib/std/zig/llvm/ir.zig
503508
src/Air.zig
504509
src/Builtin.zig
505510
src/Compilation.zig
@@ -559,19 +564,15 @@ set(ZIG_STAGE2_SOURCES
559564
src/arch/x86_64/abi.zig
560565
src/arch/x86_64/bits.zig
561566
src/arch/x86_64/encoder.zig
562-
src/arch/x86_64/encodings.zig
567+
src/arch/x86_64/encodings.zon
563568
src/clang.zig
564569
src/clang_options.zig
565570
src/clang_options_data.zig
566571
src/codegen.zig
567572
src/codegen/c.zig
568573
src/codegen/c/Type.zig
569574
src/codegen/llvm.zig
570-
src/codegen/llvm/BitcodeReader.zig
571-
src/codegen/llvm/Builder.zig
572575
src/codegen/llvm/bindings.zig
573-
src/codegen/llvm/bitcode_writer.zig
574-
src/codegen/llvm/ir.zig
575576
src/codegen/spirv.zig
576577
src/codegen/spirv/Assembler.zig
577578
src/codegen/spirv/Module.zig

zig/build.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const assert = std.debug.assert;
1111
const DevEnv = @import("src/dev.zig").Env;
1212
const ValueInterpretMode = enum { direct, by_name };
1313

14-
const zig_version: std.SemanticVersion = .{ .major = 0, .minor = 14, .patch = 0 };
14+
const zig_version: std.SemanticVersion = .{ .major = 0, .minor = 15, .patch = 0 };
1515
const stack_size = 46 * 1024 * 1024;
1616

1717
pub fn build(b: *std.Build) !void {
@@ -742,7 +742,7 @@ fn addCmakeCfgOptionsToExe(
742742
const mod = exe.root_module;
743743
const target = mod.resolved_target.?.result;
744744

745-
if (target.isDarwin()) {
745+
if (target.os.tag.isDarwin()) {
746746
// useful for package maintainers
747747
exe.headerpad_max_install_names = true;
748748
}

zig/build.zig.zon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// The Zig compiler is not intended to be consumed as a package.
22
// The sole purpose of this manifest file is to test the compiler.
33
.{
4-
.name = "zig",
4+
.name = .zig,
55
.version = "0.0.0",
66
.dependencies = .{
77
.standalone_test_cases = .{
@@ -12,4 +12,5 @@
1212
},
1313
},
1414
.paths = .{""},
15+
.fingerprint = 0xc1ce108124179e16,
1516
}

zig/doc/build.zig.zon.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ build.zig.
1010

1111
### `name`
1212

13-
String. Required.
13+
Enum literal. Required.
1414

1515
This is the default name used by packages depending on this one. For example,
1616
when a user runs `zig fetch --save <url>`, this field is used as the key in the
@@ -20,12 +20,42 @@ will stick with this provided value.
2020
It is redundant to include "zig" in this name because it is already within the
2121
Zig package namespace.
2222

23+
Must be a valid bare Zig identifier (don't `@` me), limited to 32 bytes.
24+
25+
Together with `fingerprint`, this represents a globally unique package identifier.
26+
27+
### `fingerprint`
28+
29+
Together with `name`, this represents a globally unique package identifier. This
30+
field is auto-initialized by the toolchain when the package is first created,
31+
and then *never changes*. This allows Zig to unambiguously detect when one
32+
package is an updated version of another.
33+
34+
When forking a Zig project, this fingerprint should be regenerated if the upstream
35+
project is still maintained. Otherwise, the fork is *hostile*, attempting to
36+
take control over the original project's identity. The fingerprint can be regenerated
37+
by deleting the field and running `zig build`.
38+
39+
This 64-bit integer is the combination of a 32-bit id component and a 32-bit
40+
checksum.
41+
42+
The id component within the fingerprint has these restrictions:
43+
44+
`0x00000000` is reserved for legacy packages.
45+
46+
`0xffffffff` is reserved to represent "naked" packages.
47+
48+
The checksum is computed from `name` and serves to protect Zig users from
49+
accidental id collisions.
50+
2351
### `version`
2452

2553
String. Required.
2654

2755
[semver](https://semver.org/)
2856

57+
Limited to 32 bytes.
58+
2959
### `minimum_zig_version`
3060

3161
String. Optional.

0 commit comments

Comments
 (0)