Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-04-26 13:01:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap.c: work around the gcc sra miscomp using preprocessor checks rather than CLI arg (#31589)

Browse Source 
Closes #31577
I've also extended the "good" ranges to fit versions >14.3 and >13.4, since both of these branches have the fix merged so if they ever make a dot release it should be good.

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31589
Reviewed-by: Andrew Kelley <andrew@ziglang.org>
Co-authored-by: fardragon <michaldrozd@protonmail.ch>
Co-committed-by: fardragon <michaldrozd@protonmail.ch>
This commit is contained in:
fardragon
2026-03-20 04:55:51 +01:00
committed by Andrew Kelley
parent 3c8b96df6d
commit 4acecad933
3 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+16 -5
View File
@@ -625,11 +625,22 @@ else()
else()
set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")
endif()
# Prevent GCC from miscompiling 'zig2.c'. See also 'workaround_gcc_sra_miscomp' in 'bootstrap.c'.
if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "13.0" AND
CMAKE_C_COMPILER_VERSION VERSION_LESS_EQUAL "15.2")
set(ZIG2_COMPILE_FLAGS "${ZIG2_COMPILE_FLAGS} -fno-tree-sra")
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
# Prevent GCC from miscompiling 'zig2.c'. See also 'GCC_BUG_119085_PRESENT' workaround details in 'bootstrap.c'.
if (
(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0" AND
CMAKE_C_COMPILER_VERSION VERSION_LESS_EQUAL "13.4") OR
(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "14.0" AND
CMAKE_C_COMPILER_VERSION VERSION_LESS_EQUAL "14.3") OR
(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0" AND
CMAKE_C_COMPILER_VERSION VERSION_LESS "15.2")
)
set(ZIG2_COMPILE_FLAGS "${ZIG2_COMPILE_FLAGS} -fno-tree-sra")
endif()
# Prevent GCC from spamming false positive `-Waddress-of-packed-member` warnings in 'zig2.c'.
# See also 'GCC_BUG_94081_PRESENT' workaround details in 'bootstrap.c'.
set(ZIG2_COMPILE_FLAGS "${ZIG2_COMPILE_FLAGS} -Wno-address-of-packed-member")
endif()
endif()