Skip to content

Update GCC 12.4.1 #9303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
smuzaffar wants to merge 5 commits into from
Closed

Update GCC 12.4.1 #9303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1c3b9d
Update GCC 12.4.1
smuzaffar Jul 16, 2024
1b747b0
Update gcc.spec
smuzaffar Jul 16, 2024
613d2b2
Update gcc.spec
smuzaffar Jul 16, 2024
bed8e9f
avoid array-bound errors from pybind11 in onnxruntime and py3-contourpy
smuzaffar Jul 17, 2024
bf7bb3e
avoid array bound errors for gcc 12.4
smuzaffar Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions gcc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### RPM external gcc 12.3.1
### RPM external gcc 12.4.1
## USE_COMPILER_VERSION
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
# Use the git repository for fetching the sources. This gives us more control while developing
# a new platform so that we can compile yet to be released versions of the compiler.
# See: https://gcc.gnu.org/viewcvs/gcc/branches/gcc-8-branch/?view=log
%define gccTag 10ebb8b9db2ec7ad53e4fc1f2900d9a8c8ddeaea
%define gccTag 9e00ae3e23eef8bff497981e00853ca092772201
%define gccBranch releases/gcc-12

%define moduleName %{n}-%{realversion}
Expand Down Expand Up @@ -264,6 +264,7 @@ export LD_LIBRARY_PATH=%{i}/lib64:%{i}/lib:$LD_LIBRARY_PATH
$CONF_GCC_OS_SPEC $CONF_GCC_WITH_LTO --with-gmp=%{i} --with-mpfr=%{i} --enable-bootstrap \
--with-mpc=%{i} --with-isl=%{i} --enable-checking=release \
--build=%{_build} --host=%{_host} --enable-libstdcxx-time=rt $CONF_GCC_ARCH_SPEC \
--enable-libstdcxx-backtrace=yes \
--enable-shared --disable-libgcj \
--with-zstd=%{i}/tmp/sw \
CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" \
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cmake ../%{n}-%{realversion}/cmake -GNinja \
-Donnxruntime_BUILD_UNIT_TESTS=OFF \
-DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${LIBPNG_ROOT};${PROTOBUF_ROOT};${PY3_PYBIND11_ROOT};${RE2_ROOT}" \
-DRE2_INCLUDE_DIR="${RE2_ROOT}/include" \
-DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=maybe-uninitialized"
-DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=maybe-uninitialized -Wno-error=array-bounds"

# -Wno-error=stringop-overflow is needed to work around a false positive string overflow,
# see https://github.com/google/flatbuffers/issues/7366
Expand Down
3 changes: 3 additions & 0 deletions pip/contourpy.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Requires: py3-pybind11 py3-numpy py3-meson-python py3-meson
%define PipPreBuild \
export CXXFLAGS="-Wno-error=array-bounds"

%define PipPostPost \
%{relocateConfig}lib/python*/site-packages/contourpy/util/_build_config.py
2 changes: 1 addition & 1 deletion scram-tools.file/tools/gcc/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ GCC_CXXFLAGS="$GCC_CXXFLAGS -fno-math-errno --param vect-max-version-for-alias-c
GCC_CXXFLAGS="$GCC_CXXFLAGS -Xassembler --compress-debug-sections"

#FIXME: GCC 12.2 workaround
if [[ "$GCC_VERSION" =~ ^12\.[23]\. ]] ; then
if [[ "$GCC_VERSION" =~ ^12\.[234]\. ]] ; then
GCC_CXXFLAGS="$GCC_CXXFLAGS -Wno-error=array-bounds -Warray-bounds"
fi

Expand Down