Merge branch 'master' into fix-min-int-peertypes

Author: flyfish30

.gitattributes

@@ -2,14 +2,20 @@
 *.zon text eol=lf
 *.txt text eol=lf
 langref.html.in text eol=lf
+
 lib/std/compress/testdata/** binary
-lib/std/compress/deflate/testdata/** binary
 lib/std/compress/flate/testdata/** binary
+lib/std/compress/lzma/testdata/** binary
+lib/std/compress/xz/testdata/** binary
+lib/std/crypto/codecs/asn1/der/testdata/** binary
+lib/std/tar/testdata/** binary
+src/Package/Fetch/testdata/** binary
+src/Package/Fetch/git/testdata/** binary
 
+lib/compiler/aro/** linguist-vendored
 lib/include/** linguist-vendored
 lib/libc/** linguist-vendored
 lib/libcxx/** linguist-vendored
 lib/libcxxabi/** linguist-vendored
+lib/libtsan/** linguist-vendored
 lib/libunwind/** linguist-vendored
-lib/tsan/** linguist-vendored
-lib/compiler/aro/** linguist-vendored

.github/workflows/ci.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - llvm19
 concurrency:
   # Cancels pending runs when a PR gets updated.
   group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
@@ -14,31 +13,31 @@ permissions:
   contents: read
 jobs:
   x86_64-linux-debug:
-    timeout-minutes: 420
+    timeout-minutes: 480
     runs-on: [self-hosted, Linux, x86_64]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build and Test
         run: sh ci/x86_64-linux-debug.sh
   x86_64-linux-release:
-    timeout-minutes: 420
+    timeout-minutes: 480
     runs-on: [self-hosted, Linux, x86_64]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build and Test
         run: sh ci/x86_64-linux-release.sh
   aarch64-linux-debug:
-    timeout-minutes: 480
+    timeout-minutes: 540
     runs-on: [self-hosted, Linux, aarch64]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build and Test
         run: sh ci/aarch64-linux-debug.sh
   aarch64-linux-release:
-    timeout-minutes: 480
+    timeout-minutes: 540
     runs-on: [self-hosted, Linux, aarch64]
     steps:
       - name: Checkout

CMakeLists.txt

@@ -38,7 +38,7 @@ project(zig
 )
 
 set(ZIG_VERSION_MAJOR 0)
-set(ZIG_VERSION_MINOR 14)
+set(ZIG_VERSION_MINOR 15)
 set(ZIG_VERSION_PATCH 0)
 set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find out with git.")
 
@@ -132,9 +132,9 @@ else()
     set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
 endif()
 
-find_package(llvm 19)
-find_package(clang 19)
-find_package(lld 19)
+find_package(llvm 20)
+find_package(clang 20)
+find_package(lld 20)
 
 if(ZIG_STATIC_ZLIB)
     if (MSVC)
@@ -444,7 +444,6 @@ set(ZIG_STAGE2_SOURCES
     lib/std/json.zig
     lib/std/json/stringify.zig
     lib/std/leb128.zig
-    lib/std/linked_list.zig
     lib/std/log.zig
     lib/std/macho.zig
     lib/std/math.zig
@@ -699,6 +698,13 @@ add_library(zigcpp STATIC ${ZIG_CPP_SOURCES})
 target_compile_features(zigcpp PRIVATE cxx_std_17)
 set_target_properties(zigcpp PROPERTIES POSITION_INDEPENDENT_CODE ${ZIG_PIE})
 
+if(LLVM_LINK_MODE STREQUAL "static")
+  target_compile_definitions(zigcpp PRIVATE
+    LLVM_BUILD_STATIC
+    CLANG_BUILD_STATIC
+  )
+endif()
+
 if(NOT MSVC)
   if(MINGW)
     target_compile_options(zigcpp PRIVATE -Wno-format)
@@ -809,7 +815,7 @@ if(MSVC)
 else()
   set(ZIG_WASM2C_COMPILE_FLAGS "-std=c99 -O2")
   set(ZIG1_COMPILE_FLAGS "-std=c99 -Os")
-  set(ZIG2_COMPILE_FLAGS "-std=c99 -O0 -fno-stack-protector")
+  set(ZIG2_COMPILE_FLAGS "-std=c99 -O0 -fno-sanitize=undefined -fno-stack-protector")
   if(APPLE)
     set(ZIG2_LINK_FLAGS "-Wl,-stack_size,0x10000000")
   elseif(MINGW)

README.md

@@ -47,7 +47,7 @@ Ensure you have the required dependencies:
 
  * CMake >= 3.15
  * System C/C++ Toolchain
- * LLVM, Clang, LLD development libraries == 19.x
+ * LLVM, Clang, LLD development libraries == 20.x
 
 Then it is the standard CMake build process: