diff --git a/.gitignore b/.gitignore index b67c902..dd94dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,83 @@ +/gcc-10.0.1-20200118.tar.xz +/newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz +/nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz +/gcc-10.0.1-20200121.tar.xz +/gcc-10.0.1-20200123.tar.xz +/gcc-10.0.1-20200126.tar.xz +/gcc-10.0.1-20200130.tar.xz +/gcc-10.0.1-20200216.tar.xz +/gcc-10.0.1-20200311.tar.xz +/gcc-10.0.1-20200325.tar.xz +/gcc-10.0.1-20200328.tar.xz +/gcc-10.0.1-20200420.tar.xz +/gcc-10.0.1-20200501.tar.xz +/gcc-10.1.1-20200507.tar.xz +/gcc-10.1.1-20200618.tar.xz +/gcc-10.2.1-20200723.tar.xz +/gcc-10.2.1-20200804.tar.xz +/gcc-10.2.1-20200826.tar.xz +/gcc-10.2.1-20200916.tar.xz +/gcc-10.2.1-20201005.tar.xz +/gcc-10.2.1-20201016.tar.xz +/gcc-10.2.1-20201102.tar.xz +/gcc-10.2.1-20201112.tar.xz +/gcc-10.2.1-20201125.tar.xz +/gcc-11.0.0-20201204.tar.xz +/gcc-11.0.0-20201216.tar.xz +/gcc-11.0.0-20201217.tar.xz +/gcc-11.0.0-20201223.tar.xz +/gcc-11.0.0-20210109.tar.xz +/gcc-11.0.0-20210113.tar.xz +/gcc-11.0.0-20210116.tar.xz +/gcc-11.0.0-20210119.tar.xz +/gcc-11.0.0-20210123.tar.xz +/gcc-11.0.0-20210130.tar.xz +/gcc-11.0.0-20210210.tar.xz +/gcc-11.0.0-20210225.tar.xz +/gcc-11.0.1-20210307.tar.xz +/gcc-11.0.1-20210319.tar.xz +/isl-0.18.tar.bz2 +/gcc-11.0.1-20210324.tar.xz +/gcc-11.0.1-20210405.tar.xz +/gcc-11.0.1-20210418.tar.xz +/gcc-11.0.1-20210422.tar.xz +/gcc-11.0.1-20210423.tar.xz +/gcc-11.1.1-20210428.tar.xz +/gcc-11.1.1-20210512.tar.xz +/gcc-11.1.1-20210531.tar.xz +/gcc-11.1.1-20210617.tar.xz +/gcc-11.1.1-20210623.tar.xz +/gcc-11.1.1-20210726.tar.xz +/gcc-11.2.1-20210728.tar.xz +/gcc-11.2.1-20210823.tar.xz +/gcc-11.2.1-20211012.tar.xz +/gcc-11.2.1-20211018.tar.xz +/gcc-11.2.1-20211019.tar.xz +/gcc-11.2.1-20211203.tar.xz +/gcc-12.0.0-20220108.tar.xz +/gcc-12.0.0-20220112.tar.xz +/gcc-12.0.0-20220115.tar.xz +/gcc-12.0.1-20220118.tar.xz +/gcc-12.0.1-20220125.tar.xz +/gcc-12.0.1-20220129.tar.xz +/gcc-12.0.1-20220202.tar.xz +/gcc-12.0.1-20220205.tar.xz +/gcc-12.0.1-20220212.tar.xz +/gcc-12.0.1-20220214.tar.xz +/gcc-12.0.1-20220222.tar.xz +/gcc-12.0.1-20220306.tar.xz +/gcc-12.0.1-20220308.tar.xz +/gcc-12.0.1-20220401.tar.xz +/gcc-12.0.1-20220411.tar.xz +/gcc-12.0.1-20220413.tar.xz +/gcc-12.0.1-20220429.tar.xz +/gcc-12.1.1-20220507.tar.xz +/gcc-12.1.1-20220628.tar.xz +/gcc-12.1.1-20220810.tar.xz +/gcc-12.2.1-20220819.tar.xz +/gcc-12.2.1-20221103.tar.xz /isl-0.24.tar.bz2 -/nvptx-tools-87ce9dc5999e5fca2e1d3478a30888d9864c9804.tar.xz -/newlib-cygwin-2e4db338ac125579d555aeee516e48588a628a16.tar.xz -/gcc-15.0.1-20250201.tar.xz -/gcc-15.0.1-20250204.tar.xz -/gcc-15.0.1-20250225.tar.xz -/gcc-15.0.1-20250301.tar.xz -/gcc-15.0.1-20250313.tar.xz -/gcc-15.0.1-20250329.tar.xz -/gcc-15.0.1-20250410.tar.xz -/newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz -/gcc-15.0.1-20250417.tar.xz -/gcc-15.0.1-20250418.tar.xz -/gcc-15.1.1-20250425.tar.xz -/gcc-15.1.1-20250521.tar.xz -/gcc-15.1.1-20250707.tar.xz -/gcc-15.1.1-20250718.tar.xz -/gcc-15.1.1-20250719.tar.xz -/gcc-15.2.1-20250808.tar.xz -/nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz -/gcc-15.2.1-20250924.tar.xz -/gcc-15.2.1-20251022.tar.xz -/gcc-15.2.1-20251111.tar.xz -/gcc-15.2.1-20251211.tar.xz -/gcc-16.0.0-20251218.tar.xz -/gcc-16.0.0-20251220.tar.xz -/gcc-16.0.0-20260103.tar.xz -/gcc-16.0.0-20260110.tar.xz -/gcc-16.0.0-20260112.tar.xz -/gcc-16.0.1-20260112.tar.xz -/gcc-16.0.1-20260113.tar.xz -/gcc-16.0.1-20260115.tar.xz +/newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz +/nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz +/gcc-12.2.1-20221121.tar.xz +/gcc-12.3.1-20230508.tar.xz diff --git a/gcc.spec b/gcc.spec index 71e5d1d..aad0b43 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,18 +1,16 @@ -%global DATE 20260115 -%global gitrev 1a9a51aca25eaad91d80869c43859274fe5e1096 -%global gcc_version 16.0.1 -%global gcc_major 16 +%global DATE 20230508 +%global gitrev ee1368149014a803a1835e029794a922f6c132f6 +%global gcc_version 12.3.1 +%global gcc_major 12 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 0 -%global nvptx_tools_gitrev a0c1fff6534a4df9fb17937c3c4a4b1071212029 -%global newlib_cygwin_gitrev d35cc82b5ec15bb8a5fe0fe11e183d1887992e99 +%global gcc_release 1 +%global nvptx_tools_gitrev 472b6e78b3ba918d727698f79911360b7c808247 +%global newlib_cygwin_gitrev a8526cb52bedabd4d6ba4b227a5185627f871aa1 %global _unpackaged_files_terminate_build 0 -%if 0%{?fedora:1} %global _performance_build 1 # Hardening slows the compiler way too much. %undefine _hardened_build -%endif %undefine _auto_set_build_flags %if 0%{?fedora} > 27 || 0%{?rhel} > 7 # Until annobin is fixed (#1519165). @@ -26,13 +24,6 @@ %if 0%{?__brp_strip_lto:1} %global __brp_strip_lto %{__brp_strip_lto} || : %endif -%if 0%{?rhel} > 0 -%define bugurl https://issues.redhat.com -%else -%define bugurl https://bugzilla.redhat.com/bugzilla -%endif -%{!?dist_bug_report_url: %global dist_bug_report_url %bugurl} - %if 0%{?fedora} < 32 && 0%{?rhel} < 8 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 %else @@ -43,9 +34,6 @@ %global build_objc 0 %global build_go 0 %global build_d 0 -%global build_m2 0 -%global build_cobol 0 -%global build_algol68 0 %else %ifarch %{ix86} x86_64 ia64 ppc %{power64} alpha s390x %{arm} aarch64 riscv64 %global build_ada 1 @@ -63,44 +51,28 @@ %else %global build_d 0 %endif -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64 -%global build_m2 1 -%else -%global build_m2 0 -%endif -%ifarch x86_64 aarch64 ppc64le -%global build_cobol 1 -%else -%global build_cobol 0 -%endif -%global build_algol68 1 %endif %ifarch %{ix86} x86_64 ia64 ppc64le %global build_libquadmath 1 %else %global build_libquadmath 0 %endif -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %global build_libasan 1 %else %global build_libasan 0 %endif -%ifarch x86_64 aarch64 -%global build_libhwasan 1 -%else -%global build_libhwasan 0 -%endif -%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64 +%ifarch x86_64 ppc64 ppc64le aarch64 s390x %global build_libtsan 1 %else %global build_libtsan 0 %endif -%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64 +%ifarch x86_64 ppc64 ppc64le aarch64 s390x %global build_liblsan 1 %else %global build_liblsan 0 %endif -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %global build_libubsan 1 %else %global build_libubsan 0 @@ -110,7 +82,7 @@ %else %global build_libatomic 0 %endif -%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64 riscv64 +%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64 %global build_libitm 1 %else %global build_libitm 0 @@ -121,7 +93,7 @@ %global build_isl 1 %endif %global build_libstdcxx_docs 1 -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} riscv64 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips} %global attr_ifunc 1 %else %global attr_ifunc 0 @@ -131,11 +103,6 @@ %else %global build_offload_nvptx 0 %endif -%ifarch x86_64 -%global build_offload_amdgcn 1 -%else -%global build_offload_amdgcn 0 -%endif %if 0%{?fedora} < 32 && 0%{?rhel} < 8 %ifarch s390x %global multilib_32_arch s390 @@ -158,35 +125,29 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.3%{?dist} -# License notes for some of the less obvious ones: -# gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para -# isl: MIT, BSD-2-Clause -# libcody: Apache-2.0 -# libphobos/src/etc/c/curl.d: curl -# All of the remaining license soup is in newlib. -License: GPL-3.0-or-later AND LGPL-3.0-or-later AND (GPL-3.0-or-later WITH GCC-exception-3.1) AND (GPL-3.0-or-later WITH Texinfo-exception) AND (LGPL-2.1-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH GNU-compiler-exception) AND BSL-1.0 AND GFDL-1.3-or-later AND Linux-man-pages-copyleft-2-para AND SunPro AND BSD-1-Clause AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND BSD-4-Clause AND BSD-Source-Code AND Zlib AND MIT AND Apache-2.0 AND (Apache-2.0 WITH LLVM-Exception) AND ZPL-2.1 AND ISC AND LicenseRef-Fedora-Public-Domain AND HP-1986 AND curl AND Martin-Birgmeier AND HPND-Markus-Kuhn AND dtoa AND SMLNJ AND AMD-newlib AND OAR AND HPND-merchantability-variant AND HPND-Intel +Release: %{gcc_release}%{?dist} +# libgcc, libgfortran, libgomp, libstdc++ and crtstuff have +# GCC Runtime Exception. +License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD # The source for this package was pulled from upstream's vcs. # %%{gitrev} is some commit from the # https://gcc.gnu.org/git/?p=gcc.git;h=refs/vendors/redhat/heads/gcc-%%{gcc_major}-branch -# branch. Use the following command to generate the tarball: -# ./update-gcc.sh %%{gitrev} -# optionally if say /usr/src/gcc/.git/ is an existing gcc git clone -# ./update-gcc.sh %%{gitrev} /usr/src/gcc/.git/ -# to speed up the clone operations. Note, %%{gitrev} macro in -# gcc.spec shouldn't be updated before running the script, the script -# will update it, fill in some %%changelog details etc. +# branch. Use the following commands to generate the tarball: +# git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp +# git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin %%{gitrev} +# git --git-dir=gcc-dir.tmp/.git archive --prefix=%%{name}-%%{version}-%%{DATE}/ %%{gitrev} | xz -9e > %%{name}-%%{version}-%%{DATE}.tar.xz +# rm -rf gcc-dir.tmp Source0: gcc-%{version}-%{DATE}.tar.xz # The source for nvptx-tools package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone --depth 1 https://github.com/MentorEmbedded/nvptx-tools.git nvptx-tools-dir.tmp +# git clone --depth 1 git://github.com/MentorEmbedded/nvptx-tools.git nvptx-tools-dir.tmp # git --git-dir=nvptx-tools-dir.tmp/.git fetch --depth 1 origin %%{nvptx_tools_gitrev} # git --git-dir=nvptx-tools-dir.tmp/.git archive --prefix=nvptx-tools-%%{nvptx_tools_gitrev}/ %%{nvptx_tools_gitrev} | xz -9e > nvptx-tools-%%{nvptx_tools_gitrev}.tar.xz # rm -rf nvptx-tools-dir.tmp Source1: nvptx-tools-%{nvptx_tools_gitrev}.tar.xz # The source for nvptx-newlib package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone https://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp +# git clone git://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp # git --git-dir=newlib-cygwin-dir.tmp/.git archive --prefix=newlib-cygwin-%%{newlib_cygwin_gitrev}/ %%{newlib_cygwin_gitrev} ":(exclude)newlib/libc/sys/linux/include/rpc/*.[hx]" | xz -9e > newlib-cygwin-%%{newlib_cygwin_gitrev}.tar.xz # rm -rf newlib-cygwin-dir.tmp Source2: newlib-cygwin-%{newlib_cygwin_gitrev}.tar.xz @@ -206,8 +167,11 @@ URL: http://gcc.gnu.org # Need binutils which support -plugin # Need binutils which support .loc view >= 2.30 # Need binutils which support --generate-missing-build-notes=yes >= 2.31 -# Need binutils which support .base64 >= 2.43 -BuildRequires: binutils >= 2.43 +%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 +BuildRequires: binutils >= 2.31 +%else +BuildRequires: binutils >= 2.24 +%endif # While gcc doesn't include statically linked binaries, during testing # -static is used several times. BuildRequires: glibc-static @@ -220,9 +184,6 @@ BuildRequires: gcc, gcc-c++, make %if %{build_go} BuildRequires: hostname, procps %endif -%if %{build_cobol} -BuildRequires: libxml2-devel -%endif # For VTA guality testing BuildRequires: gdb # Make sure pthread.h doesn't contain __thread tokens @@ -236,11 +197,9 @@ BuildRequires: libzstd-devel # Make sure glibc supports TFmode long double BuildRequires: glibc >= 2.3.90-35 %endif -%ifarch %{multilib_64_archs} -BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32)) -%endif -%ifarch sparcv9 ppc -BuildRequires: (glibc64 or glibc-devel(%{__isa_name}-64)) +%ifarch %{multilib_64_archs} sparcv9 ppc +# Ensure glibc{,-devel} is installed for both multilib arches +BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so %endif %if %{build_ada} # Ada requires Ada to build @@ -257,9 +216,6 @@ BuildRequires: libunwind >= 0.98 BuildRequires: doxygen >= 1.7.1 BuildRequires: graphviz, dblatex, texlive-collection-latex, docbook5-style-xsl %endif -%if %{build_offload_amdgcn} -BuildRequires: llvm >= 15, lld >= 15 -%endif Requires: cpp = %{version}-%{release} # Need .eh_frame ld optimizations # Need proper visibility support @@ -277,8 +233,11 @@ Requires: cpp = %{version}-%{release} # Need binutils that support -plugin # Need binutils that support .loc view >= 2.30 # Need binutils which support --generate-missing-build-notes=yes >= 2.31 -# Need binutils that support .base64 >= 2.43 -Requires: binutils >= 2.43 +%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 +Requires: binutils >= 2.31 +%else +Requires: binutils >= 2.24 +%endif # Make sure gdb will understand DW_FORM_strp Conflicts: gdb < 5.1-2 Requires: glibc-devel >= 2.2.90-12 @@ -293,11 +252,6 @@ Requires: glibc >= 2.16 %endif Requires: libgcc >= %{version}-%{release} Requires: libgomp = %{version}-%{release} -%if %{build_libatomic} -Requires: libatomic = %{version}-%{release} -Obsoletes: libatomic-static < %{version}-%{release} -Provides: libatomic-static = %{version}-%{release} -%endif # lto-wrapper invokes make Requires: make %if !%{build_ada} @@ -310,23 +264,22 @@ Provides: bundled(libbacktrace) Provides: bundled(libffi) Provides: gcc(major) = %{gcc_major} -Patch0: gcc16-hack.patch -Patch2: gcc16-sparc-config-detection.patch -Patch3: gcc16-libgomp-omp_h-multilib.patch -Patch4: gcc16-libtool-no-rpath.patch -Patch5: gcc16-isl-dl.patch -Patch6: gcc16-isl-dl2.patch -Patch7: gcc16-libstdc++-docs.patch -Patch8: gcc16-no-add-needed.patch -Patch9: gcc16-Wno-format-security.patch -Patch10: gcc16-rh1574936.patch -Patch11: gcc16-d-shared-libphobos.patch -Patch12: gcc16-pr119006.patch -Patch13: gcc16-pr123273.patch +Patch0: gcc12-hack.patch +Patch2: gcc12-sparc-config-detection.patch +Patch3: gcc12-libgomp-omp_h-multilib.patch +Patch4: gcc12-libtool-no-rpath.patch +Patch5: gcc12-isl-dl.patch +Patch6: gcc12-isl-dl2.patch +Patch7: gcc12-libstdc++-docs.patch +Patch8: gcc12-no-add-needed.patch +Patch9: gcc12-Wno-format-security.patch +Patch10: gcc12-rh1574936.patch +Patch11: gcc12-d-shared-libphobos.patch -Patch50: isl-rh2155127.patch - -Patch100: gcc16-fortran-fdec-duplicates.patch +Patch100: gcc12-fortran-fdec-duplicates.patch +Patch101: gcc12-fortran-flogical-as-integer.patch +Patch102: gcc12-fortran-fdec-override-kind.patch +Patch103: gcc12-fortran-fdec-non-logical-if.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -348,7 +301,7 @@ Patch100: gcc16-fortran-fdec-duplicates.patch %if %{build_go} # Avoid stripping these libraries and binaries. %global __os_install_post \ -chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \ +chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.21.* \ chmod 644 %{buildroot}%{_prefix}/bin/go.gcc \ chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc \ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \ @@ -356,7 +309,7 @@ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/test2json \ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/vet \ %__os_install_post \ -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* \ +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.21.* \ chmod 755 %{buildroot}%{_prefix}/bin/go.gcc \ chmod 755 %{buildroot}%{_prefix}/bin/gofmt.gcc \ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \ @@ -367,26 +320,26 @@ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} %endif %description -The gcc package contains the GNU Compiler Collection version %{gcc_major}. +The gcc package contains the GNU Compiler Collection version 12. You'll need this package in order to compile C code. %package -n libgcc -Summary: GCC version %{gcc_major} shared support library +Summary: GCC version 12 shared support library Autoreq: false %if !%{build_ada} Obsoletes: libgnat < %{version}-%{release} %endif -Obsoletes: libmudflap < %{version}-%{release} -Obsoletes: libmudflap-devel < %{version}-%{release} -Obsoletes: libmudflap-static < %{version}-%{release} +Obsoletes: libmudflap +Obsoletes: libmudflap-devel +Obsoletes: libmudflap-static Obsoletes: libgcj < %{version}-%{release} Obsoletes: libgcj-devel < %{version}-%{release} Obsoletes: libgcj-src < %{version}-%{release} %ifarch %{ix86} x86_64 -Obsoletes: libcilkrts < %{version}-%{release} -Obsoletes: libcilkrts-static < %{version}-%{release} -Obsoletes: libmpx < %{version}-%{release} -Obsoletes: libmpx-static < %{version}-%{release} +Obsoletes: libcilkrts +Obsoletes: libcilkrts-static +Obsoletes: libmpx +Obsoletes: libmpx-static %endif %description -n libgcc @@ -411,12 +364,6 @@ including templates and exception handling. Summary: GNU Standard C++ Library Autoreq: true Requires: glibc >= 2.10.90-7 -BuildRequires: tzdata >= 2017c -%if 0%{?fedora} > 38 || 0%{?rhel} > 9 -Recommends: tzdata >= 2017c -%else -Requires: tzdata >= 2017c -%endif %description -n libstdc++ The libstdc++ package contains a rewritten standard compliant GCC Standard @@ -494,11 +441,9 @@ programs with the GNU Compiler Collection. %package -n libgfortran Summary: Fortran runtime Autoreq: true -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 %if %{build_libquadmath} Requires: libquadmath = %{version}-%{release} %endif -%endif %description -n libgfortran This package contains Fortran shared library which is needed to run @@ -543,96 +488,15 @@ Requires: gcc-gdc = %{version}-%{release} %description -n libgphobos-static This package contains static D libraries. -%package gm2 -Summary: Modula-2 support -Requires: gcc = %{version}-%{release} -Requires: libgm2 = %{version}-%{release} -Provides: gcc-m2 = %{version}-%{release} -Provides: gm2 = %{version}-%{release} -Autoreq: true - -%description gm2 -The gcc-gm2 package provides support for compiling Modula-2 -programs with the GNU Compiler Collection. - -%package -n libgm2 -Summary: Modula-2 runtime -Autoreq: true - -%description -n libgm2 -This package contains Modula-2 shared libraries which are needed to run -Modula-2 dynamically linked programs. - -%package -n libgm2-static -Summary: Static Modula-2 libraries -Requires: libgm2 = %{version}-%{release} -Requires: gcc-gm2 = %{version}-%{release} - -%description -n libgm2-static -This package contains static Modula-2 libraries. - -%package gcobol -Summary: COBOL support -Requires: gcc = %{version}-%{release} -Requires: gcc-c++ = %{version}-%{release} -Requires: libgcobol = %{version}-%{release} -Autoreq: true - -%description gcobol -The gcc-gcobol package provides support for compiling COBOL -programs with the GNU Compiler Collection. - -%package -n libgcobol -Summary: COBOL runtime -Autoreq: true - -%description -n libgcobol -This package contains COBOL shared libraries which are needed to run -COBOL dynamically linked programs. - -%package -n libgcobol-static -Summary: Static COBOL libraries -Requires: libgcobol = %{version}-%{release} -Requires: gcc-gcobol = %{version}-%{release} - -%description -n libgcobol-static -This package contains static COBOL libraries. - -%package algol68 -Summary: Algol 68 support -Requires: gcc = %{version}-%{release} -Requires: libga68 = %{version}-%{release} -Autoreq: true - -%description algol68 -The gcc-algol68 package provides support for compiling Algol 68 -programs with the GNU Compiler Collection. - -%package -n libga68 -Summary: Algol 68 runtime -Autoreq: true - -%description -n libga68 -This package contains Algol 68 shared libraries which are needed to run -Algol 68 dynamically linked programs. - -%package -n libga68-static -Summary: Static Algol 68 libraries -Requires: libga68 = %{version}-%{release} -Requires: gcc-algol68 = %{version}-%{release} - -%description -n libga68-static -This package contains static Algol 68 libraries. - %package -n libgomp -Summary: GCC OpenMP v5.2 shared support library +Summary: GCC OpenMP v4.5 shared support library %description -n libgomp This package contains GCC shared support library which is needed -for OpenMP v5.2 support. +for OpenMP v4.5 support. %package -n libgomp-offload-nvptx -Summary: GCC OpenMP v5.2 plugin for offloading to NVPTX +Summary: GCC OpenMP v4.5 plugin for offloading to NVPTX Requires: libgomp = %{version}-%{release} %description -n libgomp-offload-nvptx @@ -640,17 +504,6 @@ This package contains libgomp plugin for offloading to NVidia PTX. The plugin needs libcuda.so.1 shared library that has to be installed separately. -%package -n libgomp-offload-amdgcn -Summary: GCC OpenMP v5.2 plugin for offloading to AMD GCN -Requires: libgomp = %{version}-%{release} -%if 0%{?fedora:1} -Requires: rocm-runtime >= 6.0.0 -%endif - -%description -n libgomp-offload-amdgcn -This package contains libgomp plugin for offloading to AMD ROCm capable -devices. - %package gdb-plugin Summary: GCC plugin for GDB Requires: gcc = %{version}-%{release} @@ -677,20 +530,6 @@ Requires: libgccjit = %{version}-%{release} %description -n libgccjit-devel This package contains header files and documentation for GCC JIT front-end. -%package -n libgdiagnostics -Summary: Library for emitting diagnostics - -%description -n libgdiagnostics -This package contains libgdiagnostics shared library and sarif-replay program. - -%package -n libgdiagnostics-devel -Summary: Support for emitting diagnostics -Requires: libgdiagnostics = %{version}-%{release} - -%description -n libgdiagnostics-devel -This package contains header files and documentation for the libgdiagnostics -library. - %package -n libquadmath Summary: GCC __float128 shared support library @@ -746,6 +585,13 @@ This package contains the GNU Atomic library which is a GCC support runtime library for atomic operations not supported by hardware. +%package -n libatomic-static +Summary: The GNU Atomic static library +Requires: libatomic = %{version}-%{release} + +%description -n libatomic-static +This package contains GNU Atomic static libraries. + %package -n libasan Summary: The Address Sanitizer runtime library @@ -760,21 +606,6 @@ Requires: libasan = %{version}-%{release} %description -n libasan-static This package contains Address Sanitizer static runtime library. -%package -n libhwasan -Summary: The Hardware-assisted Address Sanitizer runtime library - -%description -n libhwasan -This package contains the Hardware-assisted Address Sanitizer library -which is used for -fsanitize=hwaddress instrumented programs. - -%package -n libhwasan-static -Summary: The Hardware-assisted Address Sanitizer static library -Requires: libhwasan = %{version}-%{release} - -%description -n libhwasan-static -This package contains Hardware-assisted Address Sanitizer static runtime -library. - %package -n libtsan Summary: The Thread Sanitizer runtime library @@ -940,18 +771,6 @@ NVidia PTX. OpenMP and OpenACC programs linked with -fopenmp will by default add PTX code into the binaries, which can be offloaded to NVidia PTX capable devices if available. -%package offload-amdgcn -Summary: Offloading compiler to AMD GCN -Requires: gcc = %{version}-%{release} -Requires: libgomp-offload-amdgcn = %{version}-%{release} -Requires: llvm >= 15, lld >= 15 - -%description offload-amdgcn -The gcc-offload-amdgcn package provides offloading support for -AMD GCN. OpenMP and OpenACC programs linked with -fopenmp will -by default add GCN code into the binaries, which can be offloaded -to AMD ROCm capable devices if available. - %package plugin-annobin Summary: The annobin plugin for gcc, built by the installed version of gcc Requires: gcc = %{version}-%{release} @@ -966,22 +785,29 @@ so that there cannot be any synchronization problems. %prep %setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2 -a 3 -%autopatch -p0 -m 0 -M 4 +%patch0 -p0 -b .hack~ +%patch2 -p0 -b .sparc-config-detection~ +%patch3 -p0 -b .libgomp-omp_h-multilib~ +%patch4 -p0 -b .libtool-no-rpath~ %if %{build_isl} -%autopatch -p0 -m 5 -M 6 +%patch5 -p0 -b .isl-dl~ +%patch6 -p0 -b .isl-dl2~ %endif %if %{build_libstdcxx_docs} -%autopatch -p0 7 +%patch7 -p0 -b .libstdc++-docs~ %endif -%autopatch -p0 -m 8 -M 9 +%patch8 -p0 -b .no-add-needed~ +%patch9 -p0 -b .Wno-format-security~ %if 0%{?fedora} >= 29 || 0%{?rhel} > 7 -%autopatch -p0 10 +%patch10 -p0 -b .rh1574936~ %endif -%autopatch -p0 -m 11 -M 99 -touch -r isl-0.24/m4/ax_prog_cxx_for_build.m4 isl-0.24/m4/ax_prog_cc_for_build.m4 +%patch11 -p0 -b .d-shared-libphobos~ %if 0%{?rhel} >= 9 -%autopatch -p1 100 +%patch100 -p1 -b .fortran-fdec-duplicates~ +%patch101 -p1 -b .fortran-flogical-as-integer~ +%patch102 -p1 -b .fortran-fdec-override-kind~ +%patch103 -p1 -b .fortran-fdec-non-logical-if~ %endif %ifarch %{arm} @@ -992,12 +818,14 @@ rm -f libphobos/testsuite/libphobos.gc/forkgc2.d echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE +cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h + ./contrib/gcc_update --touch LC_ALL=C sed -i -e 's/\xa0/ /' gcc/doc/options.texi sed -i -e 's/Common Driver Var(flag_report_bug)/& Init(1)/' gcc/common.opt -sed -i -e 's/m_report_bug = false;/m_report_bug = true;/' gcc/diagnostics/context.cc +sed -i -e 's/context->report_bug = false;/context->report_bug = true;/' gcc/diagnostic.cc %ifarch ppc if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then @@ -1026,15 +854,11 @@ export CONFIG_SITE=NONE CC=gcc CXX=g++ -OPT_FLAGS="%{optflags}" -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=[123]//g'` -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[123]//g'` -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-U_FORTIFY_SOURCE//g'` +OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-flto=auto//g;s/-flto//g;s/-ffat-lto-objects//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'` -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fno-omit-frame-pointer//g;s/-mbackchain//g;s/-mno-omit-leaf-frame-pointer//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Werror=format-security/-Wformat-security/g'` %ifarch sparc OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'` @@ -1077,7 +901,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ --target nvptx-none --enable-as-accelerator-for=%{gcc_target_platform} \ --enable-languages=c,c++,fortran,lto \ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=%dist_bug_report_url \ + --with-bugurl=http://bugzilla.redhat.com/bugzilla \ --enable-checking=release --with-system-zlib \ --with-gcc-major-version-only --without-isl make %{?_smp_mflags} @@ -1085,42 +909,6 @@ cd .. rm -f newlib %endif -%if %{build_offload_amdgcn} -mkdir -p objia%{_prefix}/bin objia%{_prefix}/amdgcn-amdhsa/bin -IAROOT=`pwd`/objia -ln -sf %{_prefix}/bin/llvm-ar ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ar -ln -sf %{_prefix}/bin/llvm-ar ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ranlib -ln -sf %{_prefix}/bin/llvm-mc ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-as -ln -sf %{_prefix}/bin/llvm-nm ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-nm -ln -sf %{_prefix}/bin/lld ${IAROOT}%{_prefix}/bin/amdgcn-amdhsa-ld -ln -sf ../../bin/amdgcn-amdhsa-ar ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ar -ln -sf ../../bin/amdgcn-amdhsa-ranlib ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ranlib -ln -sf ../../bin/amdgcn-amdhsa-as ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/as -ln -sf ../../bin/amdgcn-amdhsa-nm ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/nm -ln -sf ../../bin/amdgcn-amdhsa-ld ${IAROOT}%{_prefix}/amdgcn-amdhsa/bin/ld - -ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib -rm -rf obj-offload-amdgcn-amdhsa -mkdir obj-offload-amdgcn-amdhsa - -cd obj-offload-amdgcn-amdhsa -CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ - CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \ - | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \ - XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ - ../configure --disable-bootstrap --disable-sjlj-exceptions \ - --with-build-time-tools=${IAROOT}%{_prefix}/amdgcn-amdhsa/bin \ - --target amdgcn-amdhsa --enable-as-accelerator-for=%{gcc_target_platform} \ - --enable-languages=c,c++,fortran,lto \ - --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=%dist_bug_report_url \ - --enable-checking=release --with-system-zlib \ - --with-gcc-major-version-only --without-isl --disable-libquadmath -make %{?_smp_mflags} -cd .. -rm -f newlib -%endif - rm -rf obj-%{gcc_target_platform} mkdir obj-%{gcc_target_platform} cd obj-%{gcc_target_platform} @@ -1133,23 +921,16 @@ ISL_FLAG_PIC=-fPIC ISL_FLAG_PIC=-fpic %endif cd isl-build - -%ifarch riscv64 -# Update config.{sub,guess} scripts for riscv64 (the original ones are too old) -cp -f -v /usr/lib/rpm/%{_vendor}/config.guess ../../isl-%{isl_version}/config.guess -cp -f -v /usr/lib/rpm/%{_vendor}/config.sub ../../isl-%{isl_version}/config.sub -%endif - -sed -i 's|libisl\([^-]\)|libgcc%{gcc_major}privateisl\1|g' \ +sed -i 's|libisl\([^-]\)|libgcc12privateisl\1|g' \ ../../isl-%{isl_version}/Makefile.{am,in} ../../isl-%{isl_version}/configure \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make %{?_smp_mflags} CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" +make %{?_smp_mflags} make install cd ../isl-install/lib -rm libgcc%{gcc_major}privateisl.so{,.23} -mv libgcc%{gcc_major}privateisl.so.23.1.0 libisl.so.23 +rm libgcc12privateisl.so{,.23} +mv libgcc12privateisl.so.23.1.0 libisl.so.23 ln -sf libisl.so.23 libisl.so cd ../.. %endif @@ -1158,9 +939,6 @@ enablelgo= enablelada= enablelobjc= enableld= -enablelm2= -enablelcob= -enablela68= %if %{build_objc} enablelobjc=,objc,obj-c++ %endif @@ -1173,25 +951,9 @@ enablelgo=,go %if %{build_d} enableld=,d %endif -%if %{build_m2} -enablelm2=,m2 -%endif -%if %{build_cobol} -enablelcob=,cobol -%endif -%if %{build_algol68} -enablela68=,algol68 -%endif -offloadtgts= -%if %{build_offload_nvptx} -offloadtgts=nvptx-none -%endif -%if %{build_offload_amdgcn} -offloadtgts=${offloadtgts:+${offloadtgts},}amdgcn-amdhsa -%endif CONFIGURE_OPTS="\ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=%dist_bug_report_url \ + --with-bugurl=http://bugzilla.redhat.com/bugzilla \ --enable-shared --enable-threads=posix --enable-checking=release \ %ifarch ppc64le --enable-targets=powerpcle-linux \ @@ -1211,7 +973,7 @@ CONFIGURE_OPTS="\ %endif --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ --enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only \ - --enable-libstdcxx-backtrace --with-libstdcxx-zoneinfo=%{_datadir}/zoneinfo \ + --enable-libstdcxx-backtrace \ %ifnarch %{mips} --with-linker-hash-style=gnu \ %endif @@ -1221,11 +983,9 @@ CONFIGURE_OPTS="\ %else --without-isl \ %endif -%if %{build_offload_nvptx} || %{build_offload_amdgcn} - --enable-offload-targets=$offloadtgts --enable-offload-defaulted \ -%endif %if %{build_offload_nvptx} - --without-cuda-driver \ + --enable-offload-targets=nvptx-none \ + --without-cuda-driver --enable-offload-defaulted \ %endif %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 %if %{attr_ifunc} @@ -1262,12 +1022,8 @@ CONFIGURE_OPTS="\ %endif %endif %ifarch ppc64le -%if 0%{?rhel} >= 9 -%if 0%{?rhel} >= 10 - --with-cpu-32=power9 --with-tune-32=power10 --with-cpu-64=power9 --with-tune-64=power10 \ -%else +%if 0%{?rhel} == 9 --with-cpu-32=power9 --with-tune-32=power9 --with-cpu-64=power9 --with-tune-64=power9 \ -%endif %else --with-cpu-32=power8 --with-tune-32=power8 --with-cpu-64=power8 --with-tune-64=power8 \ %endif @@ -1278,9 +1034,6 @@ CONFIGURE_OPTS="\ %ifarch %{ix86} x86_64 --enable-cet \ --with-tune=generic \ -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 - --with-tls=gnu2 \ -%endif %endif %if 0%{?rhel} >= 7 %ifarch %{ix86} @@ -1288,11 +1041,7 @@ CONFIGURE_OPTS="\ %endif %ifarch x86_64 %if 0%{?rhel} > 8 -%if 0%{?rhel} > 9 - --with-arch_64=x86-64-v3 \ -%else --with-arch_64=x86-64-v2 \ -%endif %endif --with-arch_32=x86-64 \ %endif @@ -1308,7 +1057,7 @@ CONFIGURE_OPTS="\ %if 0%{?rhel} >= 7 %if 0%{?rhel} > 7 %if 0%{?rhel} > 8 -%if 0%{?rhel} >= 9 +%if 0%{?rhel} == 9 --with-arch=z14 --with-tune=z15 \ %else --with-arch=z13 --with-tune=arch13 \ @@ -1320,15 +1069,11 @@ CONFIGURE_OPTS="\ --with-arch=z196 --with-tune=zEC12 \ %endif %else -%if 0%{?fedora} >= 38 - --with-arch=z13 --with-tune=z14 \ -%else %if 0%{?fedora} >= 26 --with-arch=zEC12 --with-tune=z13 \ %else --with-arch=z9-109 --with-tune=z10 \ %endif -%endif %endif --enable-decimal-float \ %endif @@ -1352,19 +1097,6 @@ CONFIGURE_OPTS="\ %ifnarch %{arm} --with-build-config=bootstrap-lto --enable-link-serialization=1 \ %endif -%endif -%if 0%{?rhel:1} - --enable-host-pie --enable-host-bind-now \ -%endif - --disable-libssp \ -%if %{build_libquadmath} == 0 - --disable-libquadmath \ -%endif -%if %{build_libatomic} == 0 - --disable-libatomic \ -%endif -%if %{build_libitm} == 0 - --disable-libitm \ %endif " @@ -1373,7 +1105,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ ../configure --enable-bootstrap \ - --enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld}${enablelm2}${enablelcob}${enablela68},lto \ + --enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld},lto \ $CONFIGURE_OPTS %ifarch sparc sparcv9 sparc64 @@ -1394,7 +1126,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ ../../configure --disable-bootstrap --enable-host-shared \ - --enable-languages=jit --enable-libgdiagnostics $CONFIGURE_OPTS + --enable-languages=jit $CONFIGURE_OPTS make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" all-gcc cp -a gcc/libgccjit.so* ../gcc/ cd ../gcc/ @@ -1429,7 +1161,7 @@ cd ../.. # Copy various doc files here and there cd .. -mkdir -p rpm.doc/{gfortran,objc,gdc,libphobos,gm2,libgm2,libgdiagnostics-devel,gcobol,libgcobol,algol68,libga68} +mkdir -p rpm.doc/gfortran rpm.doc/objc rpm.doc/gdc rpm.doc/libphobos mkdir -p rpm.doc/go rpm.doc/libgo rpm.doc/libquadmath rpm.doc/libitm mkdir -p rpm.doc/changelogs/{gcc/cp,gcc/ada,gcc/jit,libstdc++-v3,libobjc,libgomp,libcc1,libatomic,libsanitizer} @@ -1457,36 +1189,10 @@ done) done cp -a src/LICENSE*.txt libdruntime/LICENSE.txt ../rpm.doc/libphobos/) %endif -%if %{build_m2} -(cd gcc/m2; for i in ChangeLog*; do - cp -p $i ../../rpm.doc/gm2/$i.gm2 -done) -(cd libgm2; for i in ChangeLog*; do - cp -p $i ../rpm.doc/libgm2/$i.libgm2 -done) -%endif -%if %{build_cobol} -(cd gcc/cobol; for i in ChangeLog*; do - cp -p $i ../../rpm.doc/gcobol/$i.gcobol -done) -(cd libgcobol; for i in ChangeLog*; do - cp -p $i ../rpm.doc/libgcobol/$i.libgcobol -done) -%endif -%if %{build_algol68} -(cd gcc/algol68; for i in ChangeLog*; do - cp -p $i ../../rpm.doc/algol68/$i.algol68 -done) -(cd libga68; for i in ChangeLog*; do - cp -p $i ../rpm.doc/libga68/$i.libga68 -done) -%endif %if %{build_libquadmath} (cd libquadmath; for i in ChangeLog* COPYING.LIB; do cp -p $i ../rpm.doc/libquadmath/$i.libquadmath -done; -sed -n '/==========/,/==========/{/==========/d;s/^ \* *//p}' math/cosq.c \ - > ../rpm.doc/libquadmath/LICENSE.SunPro) +done) %endif %if %{build_libitm} (cd libitm; for i in ChangeLog*; do @@ -1501,8 +1207,6 @@ done) cp -p $i ../rpm.doc/libgo/$i.libgo done) %endif -(cd gcc/doc/libgdiagnostics; make html; \ -mv _build/html ../../../rpm.doc/libgdiagnostics-devel/html ) rm -f rpm.doc/changelogs/gcc/ChangeLog.[1-9] find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9 @@ -1522,8 +1226,7 @@ CC="`$ANNOBIN_FLAGS --build-cc`" CXX="`$ANNOBIN_FLAGS --build-cxx`" \ CFLAGS="$ANNOBIN_CFLAGS1 $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \ CXXFLAGS="$ANNOBIN_CFLAGS1 `$ANNOBIN_FLAGS --build-includes` $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \ ./configure --with-gcc-plugin-dir=%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin \ - --without-annocheck --without-tests --without-docs --disable-rpath --without-debuginfod \ - --without-clang-plugin --without-llvm-plugin + --without-annocheck --without-tests --without-docs --disable-rpath --without-debuginfod make cd ../.. %endif @@ -1555,7 +1258,6 @@ cd obj-offload-nvptx-none make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \ infodir=%{buildroot}%{_infodir} install rm -rf %{buildroot}%{_prefix}/libexec/gcc/nvptx-none/%{gcc_major}/install-tools -rm -rf %{buildroot}%{_prefix}/libexec/gcc/nvptx-none/%{gcc_major}/g++-mapper-server rm -rf %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/nvptx-none/{install-tools,plugin,cc1,cc1plus,f951} rm -rf %{buildroot}%{_infodir} %{buildroot}%{_mandir}/man7 %{buildroot}%{_prefix}/share/locale rm -rf %{buildroot}%{_prefix}/lib/gcc/nvptx-none/%{gcc_major}/{install-tools,plugin} @@ -1571,44 +1273,6 @@ cd .. rm -f newlib %endif -%if %{build_offload_amdgcn} -mkdir -p %{buildroot}%{_prefix}/bin %{buildroot}%{_prefix}/amdgcn-amdhsa/bin -ln -sf llvm-ar %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ar -ln -sf llvm-ar %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ranlib -ln -sf llvm-mc %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-as -ln -sf llvm-nm %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-nm -ln -sf lld %{buildroot}%{_prefix}/bin/amdgcn-amdhsa-ld -ln -sf ../../bin/amdgcn-amdhsa-ar %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ar -ln -sf ../../bin/amdgcn-amdhsa-ranlib %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ranlib -ln -sf ../../bin/amdgcn-amdhsa-as %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/as -ln -sf ../../bin/amdgcn-amdhsa-nm %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/nm -ln -sf ../../bin/amdgcn-amdhsa-ld %{buildroot}%{_prefix}/amdgcn-amdhsa/bin/ld - -ln -sf newlib-cygwin-%{newlib_cygwin_gitrev}/newlib newlib -cd obj-offload-amdgcn-amdhsa -make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \ - infodir=%{buildroot}%{_infodir} install -rm -rf %{buildroot}%{_prefix}/libexec/gcc/amdgcn-amdhsa/%{gcc_major}/install-tools -rm -rf %{buildroot}%{_prefix}/libexec/gcc/amdgcn-amdhsa/%{gcc_major}/g++-mapper-server -rm -rf %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/{install-tools,plugin,cc1,cc1plus,f951} -rm -rf %{buildroot}%{_infodir} %{buildroot}%{_mandir}/man7 %{buildroot}%{_prefix}/share/locale -rm -rf %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/{install-tools,plugin} -rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/{install-tools,plugin,include-fixed} -rm -rf %{buildroot}%{_prefix}/%{_lib}/libc[cp]1* -mv -f %{buildroot}%{_prefix}/amdgcn-amdhsa/lib/*.{a,spec} %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/ -mv -f %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/*.a %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/ -pushd %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -for i in gfx*; do -mv -f %{buildroot}%{_prefix}/amdgcn-amdhsa/lib/$i/*.{a,spec} %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/$i/ -mv -f %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa/%{gcc_major}/$i/*.a %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa/$i/ -done -popd -find %{buildroot}%{_prefix}/lib/gcc/amdgcn-amdhsa %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa \ - %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name \*.la | xargs rm -cd .. -rm -f newlib -%endif - cd obj-%{gcc_target_platform} TARGET_PLATFORM=%{gcc_target_platform} @@ -1636,9 +1300,7 @@ ln -sf ../bin/cpp %{buildroot}/%{_prefix}/lib/cpp ln -sf gfortran %{buildroot}%{_prefix}/bin/f95 rm -f %{buildroot}%{_infodir}/dir gzip -9 %{buildroot}%{_infodir}/*.info* -%if %{build_ada} ln -sf gcc %{buildroot}%{_prefix}/bin/gnatgcc -%endif mkdir -p %{buildroot}%{_fmoddir} %if %{build_go} @@ -1683,10 +1345,12 @@ for f in `find %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_plat done # Nuke bits/*.h.gch dirs -# 1) sometimes it is hard to match the exact options used for building +# 1) there is no bits/*.h header installed, so when gch file can't be +# used, compilation fails +# 2) sometimes it is hard to match the exact options used for building # libstdc++-v3 or they aren't desirable -# 2) there are multilib issues, conflicts etc. with this -# 3) it is huge +# 3) there are multilib issues, conflicts etc. with this +# 4) it is huge # People can always precompile on their own whatever they want, but # shipping this for everybody is unnecessary. rm -rf %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/bits/*.h.gch @@ -1698,7 +1362,7 @@ cp -r -p ../libstdc++-v3/doc/html ../rpm.doc/libstdc++-v3/html cp -r -p $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api mkdir -p %{buildroot}%{_mandir}/man3 cp -r -p $libstdcxx_doc_builddir/man/man3/* %{buildroot}%{_mandir}/man3/ -find ../rpm.doc/libstdc++-v3 -name \*~ -o -name \*.orig | xargs rm -f +find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm %endif %ifarch sparcv9 sparc64 @@ -1736,12 +1400,6 @@ mv %{buildroot}%{_prefix}/%{_lib}/libitm.spec $FULLPATH/ %if %{build_libasan} mv %{buildroot}%{_prefix}/%{_lib}/libsanitizer.spec $FULLPATH/ %endif -%if %{build_cobol} -mv %{buildroot}%{_prefix}/%{_lib}/libgcobol.spec $FULLPATH/ -%endif -%if %{build_algol68} -mv %{buildroot}%{_prefix}/%{_lib}/libga68.spec $FULLPATH/ -%endif mkdir -p %{buildroot}/%{_lib} mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1 @@ -1757,11 +1415,6 @@ GROUP ( /%{_lib}/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so %else ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so %endif -rm -f $FULLPATH/libgcc_s_asneeded.so -echo '/* GNU ld script - Add DT_NEEDED entry for libgcc_s.so only if needed. */ -OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/libgcc_s_asneeded.so %ifarch sparcv9 ppc %ifarch ppc rm -f $FULLPATH/64/libgcc_s.so @@ -1773,11 +1426,6 @@ GROUP ( /lib64/libgcc_s.so.1 libgcc.a )' > $FULLPATH/64/libgcc_s.so %else ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so %endif -rm -f $FULLPATH/64/libgcc_s_asneeded.so -echo '/* GNU ld script - Add DT_NEEDED entry for libgcc_s.so only if needed. */ -OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/64/libgcc_s_asneeded.so %endif %ifarch %{multilib_64_archs} %ifarch x86_64 ppc64 ppc64p7 @@ -1790,11 +1438,6 @@ GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so %else ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so %endif -rm -f $FULLPATH/32/libgcc_s_asneeded.so -echo '/* GNU ld script - Add DT_NEEDED entry for libgcc_s.so only if needed. */ -OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -lgcc_s ) )' > $FULLPATH/32/libgcc_s_asneeded.so %endif mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/ @@ -1815,8 +1458,18 @@ fi mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib} mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++*gdb.py* \ %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ -%py_byte_compile %{python3} %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/ -%py_byte_compile %{python3} %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ +pushd ../libstdc++-v3/python +for i in `find . -name \*.py`; do + touch -r $i %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/$i +done +touch -r hook.in %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/libstdc++*gdb.py +popd +for f in `find %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/ \ + %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ -name \*.py`; do + r=${f/$RPM_BUILD_ROOT/} + %{__python3} -c 'import py_compile; py_compile.compile("'$f'", dfile="'$r'")' + %{__python3} -O -c 'import py_compile; py_compile.compile("'$f'", dfile="'$r'")' +done rm -f $FULLEPATH/libgccjit.so cp -a objlibgccjit/gcc/libgccjit.so* %{buildroot}%{_prefix}/%{_lib}/ @@ -1824,15 +1477,6 @@ cp -a ../gcc/jit/libgccjit*.h %{buildroot}%{_prefix}/include/ /usr/bin/install -c -m 644 objlibgccjit/gcc/doc/libgccjit.info %{buildroot}/%{_infodir}/ gzip -9 %{buildroot}/%{_infodir}/libgccjit.info -rm -f $FULLEPATH/libgdiagnostics.so -cp -a objlibgccjit/gcc/libgdiagnostics.so* %{buildroot}%{_prefix}/%{_lib}/ -cp -a ../gcc/libgdiagnostics*.h %{buildroot}%{_prefix}/include/ -cp -a objlibgccjit/gcc/sarif-replay %{buildroot}%{_prefix}/bin/ - -sed -e 's,\.\./include/,../../../../include/,' \ - %{buildroot}%{_prefix}/%{_lib}/libstdc++.modules.json \ - > $FULLPATH/libstdc++.modules.json - pushd $FULLPATH if [ "%{_lib}" = "lib" ]; then %if %{build_objc} @@ -1842,37 +1486,20 @@ ln -sf ../../../libstdc++.so.6.*[0-9] libstdc++.so ln -sf ../../../libgfortran.so.5.* libgfortran.so ln -sf ../../../libgomp.so.1.* libgomp.so %if %{build_go} -ln -sf ../../../libgo.so.25.* libgo.so +ln -sf ../../../libgo.so.21.* libgo.so %endif %if %{build_libquadmath} ln -sf ../../../libquadmath.so.0.* libquadmath.so %endif %if %{build_d} -ln -sf ../../../libgdruntime.so.6.* libgdruntime.so -ln -sf ../../../libgphobos.so.6.* libgphobos.so -%endif -%if %{build_m2} -for i in cor iso log min pim; do - ln -sf ../../../libm2$i.so.21.* libm2$i.so -done -%endif -%if %{build_cobol} -ln -sf ../../../libgcobol.so.2.* libgcobol.so -%endif -%if %{build_algol68} -ln -sf ../../../libga68.so.2.* libga68.so +ln -sf ../../../libgdruntime.so.3.* libgdruntime.so +ln -sf ../../../libgphobos.so.3.* libgphobos.so %endif %if %{build_libitm} ln -sf ../../../libitm.so.1.* libitm.so %endif %if %{build_libatomic} ln -sf ../../../libatomic.so.1.* libatomic.so -rm -f libatomic_asneeded.so libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so -ln -sf libatomic.a libatomic_asneeded.a %endif %if %{build_libasan} ln -sf ../../../libasan.so.8.* libasan.so @@ -1889,37 +1516,20 @@ ln -sf ../../../../%{_lib}/libstdc++.so.6.*[0-9] libstdc++.so ln -sf ../../../../%{_lib}/libgfortran.so.5.* libgfortran.so ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so %if %{build_go} -ln -sf ../../../../%{_lib}/libgo.so.25.* libgo.so +ln -sf ../../../../%{_lib}/libgo.so.21.* libgo.so %endif %if %{build_libquadmath} ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so %endif %if %{build_d} -ln -sf ../../../../%{_lib}/libgdruntime.so.6.* libgdruntime.so -ln -sf ../../../../%{_lib}/libgphobos.so.6.* libgphobos.so -%endif -%if %{build_m2} -for i in cor iso log min pim; do - ln -sf ../../../../%{_lib}/libm2$i.so.21.* libm2$i.so -done -%endif -%if %{build_cobol} -ln -sf ../../../../%{_lib}/libgcobol.so.2.* libgcobol.so -%endif -%if %{build_algol68} -ln -sf ../../../../%{_lib}/libga68.so.2.* libga68.so +ln -sf ../../../../%{_lib}/libgdruntime.so.3.* libgdruntime.so +ln -sf ../../../../%{_lib}/libgphobos.so.3.* libgphobos.so %endif %if %{build_libitm} ln -sf ../../../../%{_lib}/libitm.so.1.* libitm.so %endif %if %{build_libatomic} ln -sf ../../../../%{_lib}/libatomic.so.1.* libatomic.so -rm -f libatomic_asneeded.so libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so -ln -sf libatomic.a libatomic_asneeded.a %endif %if %{build_libasan} ln -sf ../../../../%{_lib}/libasan.so.8.* libasan.so @@ -1933,11 +1543,6 @@ rm -f libtsan.so echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.2.* | sed 's,^.*libt,libt,'`' )' > libtsan.so mv ../../../../%{_lib}/libtsan_preinit.o libtsan_preinit.o %endif -%if %{build_libhwasan} -rm -f libhwasan.so -echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libhwasan.so.0.* | sed 's,^.*libh,libh,'`' )' > libhwasan.so -mv ../../../../%{_lib}/libhwasan_preinit.o libhwasan_preinit.o -%endif %if %{build_liblsan} rm -f liblsan.so echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/liblsan.so.0.* | sed 's,^.*libl,libl,'`' )' > liblsan.so @@ -1946,7 +1551,7 @@ mv ../../../../%{_lib}/liblsan_preinit.o liblsan_preinit.o fi mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++.*a $FULLLPATH/ mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++fs.*a $FULLLPATH/ -mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++exp.*a $FULLLPATH/ +mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++_libbacktrace.*a $FULLLPATH/ mv -f %{buildroot}%{_prefix}/%{_lib}/libsupc++.*a $FULLLPATH/ mv -f %{buildroot}%{_prefix}/%{_lib}/libgfortran.*a $FULLLPATH/ %if %{build_objc} @@ -1960,25 +1565,11 @@ mv -f %{buildroot}%{_prefix}/%{_lib}/libquadmath.*a $FULLLPATH/ mv -f %{buildroot}%{_prefix}/%{_lib}/libgdruntime.*a $FULLLPATH/ mv -f %{buildroot}%{_prefix}/%{_lib}/libgphobos.*a $FULLLPATH/ %endif -%if %{build_m2} -for i in cor iso log min pim; do - mv -f %{buildroot}%{_prefix}/%{_lib}/libm2$i.*a $FULLLPATH/ - rm -f m2/m2$i/*.{a,la} - ln -sf ../../libm2$i.so m2/m2$i/ - ln -sf ../../libm2$i.a m2/m2$i/ -done -%endif -%if %{build_cobol} -mv -f %{buildroot}%{_prefix}/%{_lib}/libgcobol.*a $FULLLPATH/ -%endif -%if %{build_algol68} -mv -f %{buildroot}%{_prefix}/%{_lib}/libga68.*a $FULLLPATH/ -%endif %if %{build_libitm} mv -f %{buildroot}%{_prefix}/%{_lib}/libitm.*a $FULLLPATH/ %endif %if %{build_libatomic} -mv -f %{buildroot}%{_prefix}/%{_lib}/libatomic.*a $FULLPATH/ +mv -f %{buildroot}%{_prefix}/%{_lib}/libatomic.*a $FULLLPATH/ %endif %if %{build_libasan} mv -f %{buildroot}%{_prefix}/%{_lib}/libasan.*a $FULLLPATH/ @@ -1989,9 +1580,6 @@ mv -f %{buildroot}%{_prefix}/%{_lib}/libubsan.*a $FULLLPATH/ %if %{build_libtsan} mv -f %{buildroot}%{_prefix}/%{_lib}/libtsan.*a $FULLPATH/ %endif -%if %{build_libhwasan} -mv -f %{buildroot}%{_prefix}/%{_lib}/libhwasan.*a $FULLPATH/ -%endif %if %{build_liblsan} mv -f %{buildroot}%{_prefix}/%{_lib}/liblsan.*a $FULLPATH/ %endif @@ -2013,28 +1601,28 @@ mv -f $FULLPATH/ada{include,lib} $FULLLPATH/ pushd $FULLLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../../libgnarl-*.so libgnarl.so -ln -sf ../../../../../libgnarl-*.so libgnarl-%{gcc_major}.so +ln -sf ../../../../../libgnarl-*.so libgnarl-12.so ln -sf ../../../../../libgnat-*.so libgnat.so -ln -sf ../../../../../libgnat-*.so libgnat-%{gcc_major}.so +ln -sf ../../../../../libgnat-*.so libgnat-12.so else ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so -ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so +ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-12.so ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so -ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so +ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-12.so fi popd else pushd $FULLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../libgnarl-*.so libgnarl.so -ln -sf ../../../../libgnarl-*.so libgnarl-%{gcc_major}.so +ln -sf ../../../../libgnarl-*.so libgnarl-12.so ln -sf ../../../../libgnat-*.so libgnat.so -ln -sf ../../../../libgnat-*.so libgnat-%{gcc_major}.so +ln -sf ../../../../libgnat-*.so libgnat-12.so else ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so -ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so +ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-12.so ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so -ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so +ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-12.so fi popd fi @@ -2049,8 +1637,8 @@ ln -sf ../`echo ../../../../lib/libgfortran.so.5.* | sed s~/lib/~/lib64/~` 64/li ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so %if %{build_go} rm -f libgo.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > libgo.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > libgo.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so %endif %if %{build_libquadmath} rm -f libquadmath.so @@ -2059,30 +1647,10 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libquadmath.so.0.* | sed ' %endif %if %{build_d} rm -f libgdruntime.so libgphobos.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so -%endif -%if %{build_m2} -for i in cor iso log min pim; do - rm -f libm2$i.so - echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > libm2$i.so - echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > 64/libm2$i.so - rm -f 64/m2/m2$i/*.{a,la} - ln -sf ../../libm2$i.so 64/m2/m2$i/ - ln -sf ../../libm2$i.a 64/m2/m2$i/ -done -%endif -%if %{build_cobol} -rm -f libgcobol.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > libgcobol.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libgcobol.so -%endif -%if %{build_algol68} -rm -f libga68.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > libga68.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libga68.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so %endif %if %{build_libitm} rm -f libitm.so @@ -2093,18 +1661,6 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libitm.so.1.* | sed 's,^.* rm -f libatomic.so echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > libatomic.so echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > 64/libatomic.so -mv -f %{buildroot}%{_prefix}/lib64/libatomic.*a 64/ -rm -f libatomic_asneeded.so libatomic_asneeded.a 64/libatomic_asneeded.so 64/libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so -ln -sf libatomic.a libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > 64/libatomic_asneeded.so -ln -sf libatomic.a 64/libatomic_asneeded.a %endif %if %{build_libasan} rm -f libasan.so @@ -2127,8 +1683,8 @@ ln -sf lib32/libstdc++.a libstdc++.a ln -sf ../lib64/libstdc++.a 64/libstdc++.a ln -sf lib32/libstdc++fs.a libstdc++fs.a ln -sf ../lib64/libstdc++fs.a 64/libstdc++fs.a -ln -sf lib32/libstdc++exp.a libstdc++exp.a -ln -sf ../lib64/libstdc++exp.a 64/libstdc++exp.a +ln -sf lib32/libstdc++_libbacktrace.a libstdc++_libbacktrace.a +ln -sf ../lib64/libstdc++_libbacktrace.a 64/libstdc++_libbacktrace.a ln -sf lib32/libsupc++.a libsupc++.a ln -sf ../lib64/libsupc++.a 64/libsupc++.a %if %{build_libquadmath} @@ -2141,24 +1697,14 @@ ln -sf ../lib64/libgdruntime.a 64/libgdruntime.a ln -sf lib32/libgphobos.a libgphobos.a ln -sf ../lib64/libgphobos.a 64/libgphobos.a %endif -%if %{build_m2} -for i in cor iso log min pim; do - ln -sf lib32/libm2$i.a libm2$i.a - ln -sf ../lib64/libm2$i.a 64/libm2$i.a -done -%endif -%if %{build_cobol} -ln -sf lib32/libgcobol.a libgcobol.a -ln -sf ../lib64/libgcobol.a 64/libgcobol.a -%endif -%if %{build_algol68} -ln -sf lib32/libga68.a libga68.a -ln -sf ../lib64/libga68.a 64/libga68.a -%endif %if %{build_libitm} ln -sf lib32/libitm.a libitm.a ln -sf ../lib64/libitm.a 64/libitm.a %endif +%if %{build_libatomic} +ln -sf lib32/libatomic.a libatomic.a +ln -sf ../lib64/libatomic.a 64/libatomic.a +%endif %if %{build_libasan} ln -sf lib32/libasan.a libasan.a ln -sf ../lib64/libasan.a 64/libasan.a @@ -2192,8 +1738,8 @@ ln -sf ../`echo ../../../../lib64/libgfortran.so.5.* | sed s~/../lib64/~/~` 32/l ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so %if %{build_go} rm -f libgo.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > libgo.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.25.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > libgo.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.21.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so %endif %if %{build_libquadmath} rm -f libquadmath.so @@ -2202,30 +1748,10 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libquadmath.so.0.* | sed ' %endif %if %{build_d} rm -f libgdruntime.so libgphobos.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.6.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.6.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so -%endif -%if %{build_m2} -for i in cor iso log min pim; do - rm -f libm2$i.so - echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > libm2$i.so - echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libm2$i.so.21.* | sed 's,^.*libm,libm,'`' )' > 32/libm2$i.so - rm -f 32/m2/m2$i/*.{a,la} - ln -sf ../../libm2$i.so 32/m2/m2$i/ - ln -sf ../../libm2$i.a 32/m2/m2$i/ -done -%endif -%if %{build_cobol} -rm -f libgcobol.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > libgcobol.so -#echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgcobol.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libgcobol.so -%endif -%if %{build_algol68} -rm -f libga68.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > libga68.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libga68.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libga68.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so %endif %if %{build_libitm} rm -f libitm.so @@ -2236,18 +1762,6 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libitm.so.1.* | sed 's,^.* rm -f libatomic.so echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > libatomic.so echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libatomic.so.1.* | sed 's,^.*liba,liba,'`' )' > 32/libatomic.so -mv -f %{buildroot}%{_prefix}/lib/libatomic.*a 32/ -rm -f libatomic_asneeded.so libatomic_asneeded.a 32/libatomic_asneeded.so 32/libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > libatomic_asneeded.so -ln -sf libatomic.a libatomic_asneeded.a -echo '/* GNU ld script - Add DT_NEEDED entry for -latomic only if needed. */ -OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`') -INPUT ( AS_NEEDED ( -latomic ) )' > 32/libatomic_asneeded.so -ln -sf libatomic.a 32/libatomic_asneeded.a %endif %if %{build_libasan} rm -f libasan.so @@ -2272,8 +1786,8 @@ ln -sf ../lib32/libstdc++.a 32/libstdc++.a ln -sf lib64/libstdc++.a libstdc++.a ln -sf ../lib32/libstdc++fs.a 32/libstdc++fs.a ln -sf lib64/libstdc++fs.a libstdc++fs.a -ln -sf ../lib32/libstdc++exp.a 32/libstdc++exp.a -ln -sf lib64/libstdc++exp.a libstdc++exp.a +ln -sf ../lib32/libstdc++_libbacktrace.a 32/libstdc++_libbacktrace.a +ln -sf lib64/libstdc++_libbacktrace.a libstdc++_libbacktrace.a ln -sf ../lib32/libsupc++.a 32/libsupc++.a ln -sf lib64/libsupc++.a libsupc++.a %if %{build_libquadmath} @@ -2286,24 +1800,14 @@ ln -sf lib64/libgdruntime.a libgdruntime.a ln -sf ../lib32/libgphobos.a 32/libgphobos.a ln -sf lib64/libgphobos.a libgphobos.a %endif -%if %{build_m2} -for i in cor iso log min pim; do - ln -sf ../lib32/libm2$i.a 32/libm2$i.a - ln -sf lib64/libm2$i.a libm2$i.a -done -%endif -%if %{build_cobol} -ln -sf ../lib32/libgcobol.a 32/libgcobol.a -ln -sf lib64/libgcobol.a libgcobol.a -%endif -%if %{build_algol68} -ln -sf ../lib32/libga68.a 32/libga68.a -ln -sf lib64/libga68.a libga68.a -%endif %if %{build_libitm} ln -sf ../lib32/libitm.a 32/libitm.a ln -sf lib64/libitm.a libitm.a %endif +%if %{build_libatomic} +ln -sf ../lib32/libatomic.a 32/libatomic.a +ln -sf lib64/libatomic.a libatomic.a +%endif %if %{build_libasan} ln -sf ../lib32/libasan.a 32/libasan.a ln -sf lib64/libasan.a libasan.a @@ -2331,7 +1835,7 @@ ln -sf lib64/adalib adalib ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgfortran.a 32/libgfortran.a ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++.a 32/libstdc++.a ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++fs.a 32/libstdc++fs.a -ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++exp.a 32/libstdc++exp.a +ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++_libbacktrace.a 32/libstdc++_libbacktrace.a ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libsupc++.a 32/libsupc++.a %if %{build_libquadmath} ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libquadmath.a 32/libquadmath.a @@ -2340,20 +1844,12 @@ ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libqua ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgdruntime.a 32/libgdruntime.a ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgphobos.a 32/libgphobos.a %endif -%if %{build_m2} -for i in cor iso log min pim; do - ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libm2$i.a 32/libm2$i.a -done -%endif -%if %{build_cobol} -#ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgcobol.a 32/libgcobol.a -%endif -%if %{build_algol68} -ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libga68.a 32/libga68.a -%endif %if %{build_libitm} ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libitm.a 32/libitm.a %endif +%if %{build_libatomic} +ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libatomic.a 32/libatomic.a +%endif %if %{build_libasan} ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libasan.a 32/libasan.a %endif @@ -2374,8 +1870,7 @@ ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/adalib # If we are building a debug package then copy all of the static archives # into the debug directory to keep them as unstripped copies. -# if 0%{?_enable_debug_packages} -%if 0 +%if 0%{?_enable_debug_packages} for d in . $FULLLSUBDIR; do mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/$d for f in `find $d -maxdepth 1 -a \ @@ -2387,9 +1882,8 @@ for d in . $FULLLSUBDIR; do -o -name libgolibbegin.a -o -name libgomp.a \ -o -name libitm.a -o -name liblsan.a \ -o -name libobjc.a -o -name libgdruntime.a -o -name libgphobos.a \ - -o -name libm2\*.a -o -name libquadmath.a -o -name libstdc++.a \ - -o -name libstdc++fs.a -o -name libstdc++exp.a \ - -o -name libsupc++.a -o -name libgcobol.a \ + -o -name libquadmath.a -o -name libstdc++.a \ + -o -name libstdc++fs.a -o -name libstdc++_libbacktrace.a -o -name libsupc++.a \ -o -name libtsan.a -o -name libubsan.a \) -a -type f`; do cp -a $f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/$d/ done @@ -2399,11 +1893,10 @@ done # Strip debug info from Fortran/ObjC/Java static libraries strip -g `find . \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \ -o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \ - -o -name libgdruntime.a -o -name libgphobos.a -o -name libm2\*.a \ + -o -name libgdruntime.a -o -name libgphobos.a \ -o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \ -o -name libatomic.a -o -name libasan.a -o -name libtsan.a \ - -o -name libubsan.a -o -name liblsan.a -o -name libcc1.a \ - -o -name libgcobol.a \) \ + -o -name libubsan.a -o -name liblsan.a -o -name libcc1.a \) \ -a -type f` popd chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.* @@ -2413,19 +1906,8 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libcc1.so.0.* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libquadmath.so.0.* %endif %if %{build_d} -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.6.* -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.6.* -%endif -%if %{build_m2} -for i in cor iso log min pim; do - chmod 755 %{buildroot}%{_prefix}/%{_lib}/libm2$i.so.21.* -done -%endif -%if %{build_cobol} -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgcobol.so.2.* -%endif -%if %{build_algol68} -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libga68.so.2.* +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.3.* +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.3.* %endif %if %{build_libitm} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.* @@ -2442,15 +1924,12 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libubsan.so.1.* %if %{build_libtsan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libtsan.so.2.* %endif -%if %{build_libhwasan} -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libhwasan.so.0.* -%endif %if %{build_liblsan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/liblsan.so.0.* %endif %if %{build_go} # Avoid stripping these libraries and binaries. -chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.25.* +chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.21.* chmod 644 %{buildroot}%{_prefix}/bin/go.gcc chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo @@ -2467,6 +1946,8 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgnarl*so* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgnat*so* %endif +mv $FULLPATH/include-fixed/syslimits.h $FULLPATH/include/syslimits.h +mv $FULLPATH/include-fixed/limits.h $FULLPATH/include/limits.h for h in `find $FULLPATH/include -name \*.h`; do if grep -q 'It has been auto-edited by fixincludes from' $h; then rh=`grep -A2 'It has been auto-edited by fixincludes from' $h | tail -1 | sed 's|^.*"\(.*\)".*$|\1|'` @@ -2510,6 +1991,7 @@ cd .. rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a} || : rm -f $FULLEPATH/install-tools/{mkheaders,fixincl} rm -f %{buildroot}%{_prefix}/lib/{32,64}/libiberty.a +rm -f %{buildroot}%{_prefix}/%{_lib}/libssp* rm -f %{buildroot}%{_prefix}/%{_lib}/libvtv* || : rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gfortran || : rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gccgo || : @@ -2518,10 +2000,6 @@ rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-ar || : rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-nm || : rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcc-ranlib || : rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gdc || : -rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gm2 || : -rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcobc || : -rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gcobol || : -rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-ga68 || : %ifarch %{multilib_64_archs} # Remove libraries for the other arch on multilib arches @@ -2545,31 +2023,7 @@ rm -rf %{buildroot}%{_prefix}/lib64/go/%{gcc_major}/%{gcc_target_platform} %endif %endif -rm -f %{buildroot}%{_prefix}/lib*/lib*.spec || : -rm -f %{buildroot}%{_prefix}/lib*/libstdc++.modules.json || : -rm -f %{buildroot}%{_prefix}/%{_lib}/lib{asan,atomic,gcc_s,gcobol,ga68,gdruntime,gfortran,go,gomp-plugin-*,gomp,gphobos,hwasan}.so || : -rm -f %{buildroot}%{_prefix}/%{_lib}/lib{itm,lsan,m2{cor,iso,log,min,pim},objc,quadmath,stdc++,tsan,ubsan,gcc_s_asneeded,atomic_asneeded}.so || : -rm -f %{buildroot}%{_prefix}/%{_lib}/libatomic_asneeded.a || : -rm -f %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools/{fixinc.sh,mkinstalldirs} || : -rm -f %{buildroot}%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo || : -rm -f %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include-fixed/README || : -rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ssp || : -rm -rf %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools || : -%ifarch ppc ppc64 ppc64le ppc64p7 -rm -f %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/{e,n}crt{i,n}.o || : -%endif - -%if %{build_offload_nvptx} -rm -f %{buildroot}%{_mandir}/man1/*-accel-*nvptx* -find %{buildroot}%{_prefix}/nvptx-none/lib -name libstdc++.a-gdb.py | xargs rm -f || : -find %{buildroot}%{_prefix}/nvptx-none/lib -name libstdc++.modules.json | xargs rm -f || : -%endif -%if %{build_offload_amdgcn} -rm -f %{buildroot}%{_mandir}/man1/*-accel-*amdgcn* -find %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name libstdc++.a-gdb.py | xargs rm -f || : -find %{buildroot}%{_prefix}/amdgcn-amdhsa/lib -name libstdc++.modules.json | xargs rm -f || : -%endif -rm -f %{buildroot}%{_mandir}/man7/{gpl,gfdl,fsf-funding}.7* +rm -f %{buildroot}%{mandir}/man3/ffi* # Help plugins find out nvra. echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver @@ -2594,9 +2048,9 @@ cd obj-%{gcc_target_platform} # run the tests. LC_ALL=C make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \ %if 0%{?fedora} >= 20 || 0%{?rhel} > 7 - RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector-strong/-foffload=disable}'" || : + RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector-strong}'" || : %else - RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector/-foffload=disable}'" || : + RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || : %endif %if !%{build_annobin_plugin} if [ -f %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/annobin.so ]; then @@ -2654,20 +2108,28 @@ if [ $1 = 0 ]; then %{_sbindir}/update-alternatives --remove go %{_prefix}/bin/go.gcc fi -%{?ldconfig: # Because glibc Prereq's libgcc and /sbin/ldconfig # comes from glibc, it might not exist yet when # libgcc is installed %post -n libgcc -p -if posix.access ("%ldconfig", "x") then - rpm.execute ("%ldconfig") +if posix.access ("/sbin/ldconfig", "x") then + local pid = posix.fork () + if pid == 0 then + posix.exec ("/sbin/ldconfig") + elseif pid ~= -1 then + posix.wait (pid) + end end %postun -n libgcc -p -if posix.access ("%ldconfig", "x") then - rpm.execute ("%ldconfig") +if posix.access ("/sbin/ldconfig", "x") then + local pid = posix.fork () + if pid == 0 then + posix.exec ("/sbin/ldconfig") + elseif pid ~= -1 then + posix.wait (pid) + end end -} %ldconfig_scriptlets -n libstdc++ @@ -2677,8 +2139,6 @@ end %ldconfig_scriptlets -n libgphobos -%ldconfig_scriptlets -n libgm2 - %ldconfig_scriptlets -n libgnat %ldconfig_scriptlets -n libgomp @@ -2687,8 +2147,6 @@ end %ldconfig_scriptlets -n libgccjit -%ldconfig_scriptlets -n libgdiagnostics - %ldconfig_scriptlets -n libquadmath %ldconfig_scriptlets -n libitm @@ -2703,8 +2161,6 @@ end %ldconfig_scriptlets -n liblsan -%ldconfig_scriptlets -n libhwasan - %ldconfig_scriptlets -n libgo %files -f %{name}.lang @@ -2767,8 +2223,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdnoreturn.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdatomic.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/gcov.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdckdint.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/stdcountof.h %ifarch %{ix86} x86_64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mmintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xmmintrin.h @@ -2804,7 +2258,9 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsaveintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsaveoptintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512cdintrin.h +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512erintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fintrin.h +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512pfintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/shaintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mm_malloc.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mm3dnow.h @@ -2826,6 +2282,8 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/xsavesintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/clzerointrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/pkuintrin.h +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx5124fmapsintrin.h +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx5124vnniwintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512vpopcntdqintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sgxintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/gfniintrin.h @@ -2862,33 +2320,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/mwaitintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fp16intrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512fp16vlintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxifmaintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniint8intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxneconvertintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/cmpccxaddintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxfp16intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/prfchiintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/raointintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxcomplexintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bitalgvlintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniint16intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sha512intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm3intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm4intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/usermsrintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxavx512intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxfp8intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxmovrsintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxtf32intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2bf16intrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2convertintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2copyintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2mediaintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2minmaxintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx10_2satcvtintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/movrsintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bmmintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bmmvlintrin.h %endif %ifarch ia64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ia64intrin.h @@ -2933,10 +2364,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sve.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sme.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_neon_sve_bridge.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_private_fp8.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_private_neon_types.h %endif %ifarch sparc sparcv9 sparc64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/visintrin.h @@ -2947,14 +2374,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/htmxlintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/vecintrin.h %endif -%ifarch riscv64 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_vector.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_crypto.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_bitmanip.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/riscv_th_vector.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sifive_vector.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/andes_vector.h -%endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sanitizer %endif @@ -2964,7 +2383,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcov.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_eh.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_s.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc_s_asneeded.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.spec %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgomp.so @@ -2984,7 +2402,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcov.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_eh.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_s.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgcc_s_asneeded.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgomp.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libgomp.so %if %{build_libquadmath} @@ -2998,8 +2415,6 @@ end %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic_asneeded.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic_asneeded.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libasan.a @@ -3018,7 +2433,6 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcov.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_eh.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_s.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgcc_s_asneeded.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgomp.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libgomp.so %if %{build_libquadmath} @@ -3032,8 +2446,6 @@ end %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic_asneeded.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic_asneeded.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libasan.a @@ -3057,8 +2469,6 @@ end %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.a @@ -3071,10 +2481,7 @@ end %endif %else %if %{build_libatomic} -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic_asneeded.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so @@ -3088,16 +2495,12 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o %endif -%if %{build_libhwasan} -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan_preinit.o -%endif %if %{build_liblsan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o %endif %{_prefix}/libexec/getconf/default -%doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog* +%doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog* %{!?_licensedir:%global license %%doc} %license gcc/COPYING* COPYING.RUNTIME @@ -3135,7 +2538,7 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++_libbacktrace.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libsupc++.a %endif %ifarch %{multilib_64_archs} @@ -3143,7 +2546,7 @@ end %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++_libbacktrace.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libsupc++.a %endif %ifarch sparcv9 ppc %{multilib_64_archs} @@ -3152,7 +2555,7 @@ end %ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++_libbacktrace.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsupc++.a %endif %doc rpm.doc/changelogs/gcc/cp/ChangeLog* @@ -3182,20 +2585,19 @@ end %ifnarch sparcv9 ppc %{multilib_64_archs} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.so %endif -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.modules.json %ifarch sparcv9 ppc %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++_libbacktrace.a %endif %ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++_libbacktrace.a %endif %ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++_libbacktrace.a %endif %doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README* @@ -3366,8 +2768,8 @@ end %doc rpm.doc/gdc/* %files -n libgphobos -%{_prefix}/%{_lib}/libgdruntime.so.6* -%{_prefix}/%{_lib}/libgphobos.so.6* +%{_prefix}/%{_lib}/libgdruntime.so.3* +%{_prefix}/%{_lib}/libgphobos.so.3* %doc rpm.doc/libphobos/* %files -n libgphobos-static @@ -3390,133 +2792,6 @@ end %endif %endif -%if %{build_m2} -%files gm2 -%{_prefix}/bin/gm2 -%{_mandir}/man1/gm2.1* -%{_infodir}/m2* -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%dir %{_prefix}/libexec/gcc -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform} -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/m2 -%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cc1gm2 -%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.a -%endif -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.so -%ifarch sparcv9 ppc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/m2 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libm2*.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libm2*.so -%endif -%ifarch %{multilib_64_archs} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/m2 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libm2*.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libm2*.so -%endif -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/m2rte.so -%doc rpm.doc/gm2/* - -%files -n libgm2 -%{_prefix}/%{_lib}/libm2*.so.21* -%doc rpm.doc/libgm2/* - -%files -n libgm2-static -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%ifarch sparcv9 ppc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libm2*.a -%endif -%ifarch sparc64 ppc64 ppc64p7 -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libm2*.a -%endif -%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libm2*.a -%endif -%endif - -%if %{build_cobol} -%files gcobol -%{_prefix}/bin/gcobol -%{_prefix}/bin/gcobc -%{_mandir}/man1/gcobol.1* -%{_mandir}/man3/gcobol-io.3* -%dir %{_prefix}/libexec/gcc -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform} -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} -%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cobol1 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.spec -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.so -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/cobol -%doc rpm.doc/gcobol/* - -%files -n libgcobol -%{_prefix}/%{_lib}/libgcobol.so.2* -%doc rpm.doc/libgcobol/* - -%files -n libgcobol-static -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcobol.a -%endif - -%if %{build_algol68} -%files algol68 -%{_prefix}/bin/ga68 -%{_mandir}/man1/ga68.1* -%dir %{_prefix}/libexec/gcc -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform} -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} -%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/a681 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.spec -%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.a -%endif -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.so -%ifarch sparcv9 ppc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libga68.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libga68.so -%endif -%ifarch %{multilib_64_archs} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libga68.a -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libga68.so -%endif -%{_infodir}/ga68* -%doc rpm.doc/algol68/* - -%files -n libga68 -%{_prefix}/%{_lib}/libga68.so.2* -%doc rpm.doc/libga68/* - -%files -n libga68-static -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%ifarch sparcv9 ppc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libga68.a -%endif -%ifarch sparc64 ppc64 ppc64p7 -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libga68.a -%endif -%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libga68.a -%endif -%endif - %if %{build_ada} %files gnat %{_prefix}/bin/gnat @@ -3678,6 +2953,22 @@ end %if %{build_libatomic} %files -n libatomic %{_prefix}/%{_lib}/libatomic.so.1* + +%files -n libatomic-static +%dir %{_prefix}/lib/gcc +%dir %{_prefix}/lib/gcc/%{gcc_target_platform} +%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} +%ifarch sparcv9 ppc +%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32 +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libatomic.a +%endif +%ifarch sparc64 ppc64 ppc64p7 +%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64 +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libatomic.a +%endif +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a +%endif %doc rpm.doc/changelogs/libatomic/ChangeLog* %endif @@ -3743,20 +3034,6 @@ end %license libsanitizer/LICENSE.TXT %endif -%if %{build_libhwasan} -%files -n libhwasan -%{_prefix}/%{_lib}/libhwasan.so.0* - -%files -n libhwasan-static -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan.a -%doc rpm.doc/changelogs/libsanitizer/ChangeLog* -%{!?_licensedir:%global license %%doc} -%license libsanitizer/LICENSE.TXT -%endif - %if %{build_liblsan} %files -n liblsan %{_prefix}/%{_lib}/liblsan.so.0* @@ -3817,8 +3094,7 @@ end %doc rpm.doc/go/* %files -n libgo -%{_prefix}/%{_lib}/libgo.so.25 -%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.25.* +%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.21* %doc rpm.doc/libgo/* %files -n libgo-devel @@ -3879,15 +3155,6 @@ end %doc rpm.doc/libgccjit-devel/* %doc gcc/jit/docs/examples -%files -n libgdiagnostics -%{_prefix}/bin/sarif-replay -%{_prefix}/%{_lib}/libgdiagnostics.so.* - -%files -n libgdiagnostics-devel -%{_prefix}/%{_lib}/libgdiagnostics.so -%{_prefix}/include/libgdiagnostics*.h -%doc rpm.doc/libgdiagnostics-devel/* - %files plugin-devel %dir %{_prefix}/lib/gcc %dir %{_prefix}/lib/gcc/%{gcc_target_platform} @@ -3934,30 +3201,6 @@ end %{_prefix}/%{_lib}/libgomp-plugin-nvptx.so.* %endif -%if %{build_offload_amdgcn} -%files offload-amdgcn -%{_prefix}/bin/amdgcn-amdhsa-* -%{_prefix}/bin/%{gcc_target_platform}-accel-amdgcn-amdhsa-gcc -%{_prefix}/bin/%{gcc_target_platform}-accel-amdgcn-amdhsa-lto-dump -%dir %{_prefix}/lib/gcc -%dir %{_prefix}/lib/gcc/%{gcc_target_platform} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major} -%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel -%dir %{_prefix}/libexec/gcc -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform} -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} -%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel -%{_prefix}/lib/gcc/amdgcn-amdhsa -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa -%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/accel/amdgcn-amdhsa -%dir %{_prefix}/amdgcn-amdhsa -%{_prefix}/amdgcn-amdhsa/bin -%{_prefix}/amdgcn-amdhsa/include - -%files -n libgomp-offload-amdgcn -%{_prefix}/%{_lib}/libgomp-plugin-gcn.so.* -%endif - %if %{build_annobin_plugin} %files plugin-annobin %dir %{_prefix}/lib/gcc @@ -3970,94 +3213,556 @@ end %endif %changelog -* Thu Jan 15 2026 Jakub Jelinek 16.0.1-0.3 -- update from trunk - - PRs c/123309, c++/120775, c++/122634, c++/123081, c++/123551, - debug/121045, driver/108865, driver/123504, ipa/122852, ipa/123542, - middle-end/123115, middle-end/123392, middle-end/123573, - rtl-optimization/123312, rtl-optimization/123544, target/38118, - target/114528, target/120250, target/121240, target/123092, - testsuite/122522, tree-optimization/119402, tree-optimization/120322, - tree-optimization/123109, tree-optimization/123190, - tree-optimization/123530 +* Mon May 8 2023 Jakub Jelinek 12.3.1-1 +- update from releases/gcc-12 branch + - GCC 12.3 release + - PRs analyzer/105784, analyzer/106325, analyzer/106573, analyzer/107345, + eanalyzer/107582, analyzer/107948, analyzer/108704, analyzer/108733, + analyzer/108968, analyzer/109094, bootstrap/90543, bootstrap/106482, + c++/53932, c++/69410, c++/98056, c++/100295, c++/101118, c++/101869, + c++/103081, c++/103871, c++/105406, c++/105481, c++/105593, + c++/105809, c++/105996, c++/106188, c++/106259, c++/106675, + c++/106713, c++/106890, c++/106969, c++/107065, c++/107079, + c++/107154, c++/107163, c++/107179, c++/107280, c++/107310, + c++/107417, c++/107461, c++/107542, c++/107558, c++/107574, + c++/107579, c++/107593, c++/107755, c++/107768, c++/107853, + c++/107864, c++/107938, c++/107939, c++/108099, c++/108104, + c++/108116, c++/108180, c++/108206, c++/108218, c++/108219, + c++/108242, c++/108282, c++/108286, c++/108365, c++/108468, + c++/108474, c++/108550, c++/108566, c++/108597, c++/108607, + c++/108795, c++/108829, c++/108934, c++/108975, c++/108998, + c++/109039, c++/109096, c++/109164, c++/109319, c++/109357, c/98487, + c/105972, c/107127, c/107465, c/108079, c/108880, c/108986, c/109151, + d/104749, d/105659, d/107592, d/108050, d/108055, d/108877, d/109108, + d/109144, debug/106719, debug/108573, debug/108716, debug/108967, + driver/106624, fortran/61615, fortran/85877, fortran/87127, + fortran/95107, fortran/96024, fortran/96025, fortran/99036, + fortran/99982, fortran/102331, fortran/103259, fortran/103506, + fortran/104332, fortran/104554, fortran/106209, fortran/106731, + fortran/106856, fortran/106945, fortran/107576, fortran/107872, + fortran/108010, fortran/108025, fortran/108131, fortran/108349, + fortran/108420, fortran/108421, fortran/108434, fortran/108450, + fortran/108451, fortran/108453, fortran/108501, fortran/108502, + fortran/108527, fortran/108529, fortran/108558, fortran/108609, + fortran/108923, fortran/108937, fortran/109186, fortran/109511, + ipa/105676, ipa/105685, ipa/106124, ipa/107769, ipa/107925, + ipa/107944, ipa/109318, libfortran/108056, libquadmath/87204, + libquadmath/94756, libstdc++/91456, libstdc++/100366, + libstdc++/103387, libstdc++/103755, libstdc++/103934, + libstdc++/105730, libstdc++/106183, libstdc++/106199, + libstdc++/106201, libstdc++/107466, libstdc++/107801, + libstdc++/107814, libstdc++/107850, libstdc++/107852, + libstdc++/108030, libstdc++/108097, libstdc++/108118, + libstdc++/108265, libstdc++/108362, libstdc++/108413, + libstdc++/108554, libstdc++/108636, libstdc++/108952, + libstdc++/109064, libstdc++/109165, libstdc++/109182, + libstdc++/109242, libstdc++/109299, libstdc++/109339, + libstdc++/109703, lto/109263, middle-end/102633, middle-end/106057, + middle-end/106080, middle-end/106190, middle-end/107317, + middle-end/107994, middle-end/108237, middle-end/108264, + middle-end/108435, middle-end/108459, middle-end/108500, + middle-end/108543, middle-end/108546, middle-end/108625, + middle-end/108685, middle-end/108854, other/108560, other/109293, + other/109306, rtl-optimization/106421, rtl-optimization/106751, + rtl-optimization/107482, rtl-optimization/108086, + rtl-optimization/108193, rtl-optimization/108508, + rtl-optimization/108596, rtl-optimization/108681, + rtl-optimization/109585, sanitizer/108060, sanitizer/108834, + sanitizer/109050, target/90458, target/96373, target/98776, + target/100758, target/104921, target/105554, target/105980, + target/106101, target/106736, target/106875, target/107714, + target/107863, target/107987, target/108140, target/108272, + target/108348, target/108396, target/108429, target/108589, + target/108599, target/108699, target/108807, target/108812, + target/108881, target/108910, target/109000, target/109067, + target/109072, target/109137, target/109140, target/109178, + target/109276, target/109478, target/109566, testsuite/108151, + testsuite/108973, testsuite/108985, testsuite/109560, + tree-optimization/96373, tree-optimization/105532, + tree-optimization/106523, tree-optimization/106868, + tree-optimization/106904, tree-optimization/107407, + tree-optimization/107451, tree-optimization/107554, + tree-optimization/107647, tree-optimization/107686, + tree-optimization/107766, tree-optimization/107833, + tree-optimization/107839, tree-optimization/107865, + tree-optimization/107898, tree-optimization/107956, + tree-optimization/107997, tree-optimization/108068, + tree-optimization/108076, tree-optimization/108095, + tree-optimization/108137, tree-optimization/108164, + tree-optimization/108166, tree-optimization/108199, + tree-optimization/108306, tree-optimization/108430, + tree-optimization/108440, tree-optimization/108498, + tree-optimization/108522, tree-optimization/108571, + tree-optimization/108582, tree-optimization/108603, + tree-optimization/108608, tree-optimization/108684, + tree-optimization/108688, tree-optimization/108692, + tree-optimization/108724, tree-optimization/108791, + tree-optimization/108793, tree-optimization/108816, + tree-optimization/108819, tree-optimization/108821, + tree-optimization/108950, tree-optimization/108979, + tree-optimization/109176, tree-optimization/109219, + tree-optimization/109392, tree-optimization/109410, + tree-optimization/109427, tree-optimization/109434, + tree-optimization/109469, tree-optimization/109473, + tree-optimization/109491, tree-optimization/109502, + tree-optimization/109573, tree-optimization/109609, + tree-optimization/109724 -* Tue Jan 13 2026 Jakub Jelinek 16.0.1-0.2 -- update from trunk - - PRs fortran/91960, fortran/112460, libstdc++/123396, - rtl-optimization/123444, rtl-optimization/123501, target/117581, - target/123484, testsuite/123098, tree-optimization/122843, - tree-optimization/122845, tree-optimization/123301, - tree-optimization/123525, tree-optimization/123539 +* Mon Nov 21 2022 Jakub Jelinek 12.2.1-4 +- update from releases/gcc-12 branch + - PRs c++/104066, c++/105774, c++/106829, c++/107358, c/41041, c/106981, + c/107001, libstdc++/95048, libstdc++/103295, target/104688, + target/107183, target/107304, target/107404, target/107713, + target/107748, tree-optimization/107121, tree-optimization/107206 +- fix up std::from_chars behavior in rounding modes other than FE_TONEAREST + (PR libstdc++/107468) -* Mon Jan 12 2026 Jakub Jelinek 16.0.1-0.1 -- update from trunk - - PRs c++/81337, c++/115163, c++/123526, fortran/77415, ipa/122458, - ipa/123543, libfortran/123012, middle-end/123175, - rtl-optimization/123523, target/123415, testsuite/121752, - testsuite/123129, tree-optimization/122824, tree-optimization/122830, - tree-optimization/123417, tree-optimization/123528 +* Thu Nov 3 2022 Jakub Jelinek 12.2.1-3 +- update from releases/gcc-12 branch + - PRs c++/93259, c++/105774, c++/106759, c++/106829, c++/106893, c++/106925, + c++/107358, c/106947, c/106981, c/107001, fortran/82868, + fortran/100029, fortran/100040, fortran/100097, fortran/100098, + fortran/100103, fortran/100132, fortran/100136, fortran/100245, + fortran/103413, fortran/103694, fortran/105012, fortran/105633, + fortran/106566, fortran/106579, fortran/106817, fortran/106857, + fortran/106985, fortran/106986, fortran/107054, libstdc++/105678, + libstdc++/106320, libstdc++/106589, libstdc++/106607, + libstdc++/106695, lto/107418, middle-end/106548, middle-end/106982, + other/106782, rtl-optimization/106187, target/96072, target/99184, + target/99685, target/100645, target/101322, target/103353, + target/104482, target/105421, target/105463, target/105485, + target/106017, target/106355, target/106459, target/106491, + target/106524, target/106704, target/106714, target/106721, + target/107061, target/107064, target/107248, target/107364, + tree-optimization/102892, tree-optimization/105937, + tree-optimization/106322, tree-optimization/106809, + tree-optimization/106841, tree-optimization/106860, + tree-optimization/106892, tree-optimization/106922, + tree-optimization/106934, tree-optimization/107107, + tree-optimization/107121, tree-optimization/107160, + tree-optimization/107212, tree-optimization/107254, + tree-optimization/107323 -* Sat Jan 10 2026 Jakub Jelinek 16.0.0-0.5 -- update from trunk - - PRs ada/123003, ada/123371, ada/123490, c/117687, c/121081, c/121507, - c/123212, c/123435, c/123463, c/123475, c++/123331, c++/123347, - c++/123393, debug/123259, fortran/90218, fortran/123012, - fortran/123029, fortran/123071, fortran/123321, fortran/123352, - fortran/123483, gcov-profile/123019, ipa/123383, libstdc++/122878, - libstdc++/123100, libstdc++/123183, libstdc++/123326, - libstdc++/123378, libstdc++/123406, middle-end/111817, - middle-end/123107, rtl-optimization/119291, rtl-optimization/121675, - rtl-optimization/121773, rtl-optimization/123121, - rtl-optimization/123491, target/119430, target/121192, target/121290, - target/121535, target/121778, target/122846, target/123010, - target/123017, target/123268, target/123269, target/123317, - target/123320, target/123390, target/123403, target/123457, - target/123489, target/123492, testsuite/123353, testsuite/123377, - tree-optimization/42196, tree-optimization/102486, - tree-optimization/102954, tree-optimization/122103, - tree-optimization/122608, tree-optimization/122793, - tree-optimization/123197, tree-optimization/123200, - tree-optimization/123221, tree-optimization/123298, - tree-optimization/123300, tree-optimization/123310, - tree-optimization/123315, tree-optimization/123316, - tree-optimization/123319, tree-optimization/123351, - tree-optimization/123372, tree-optimization/123374, - tree-optimization/123382, tree-optimization/123414, - tree-optimization/123431 -- fix ICE on friend with noexcept (PR c++/123189) -- fix -E -fdirectives-only comment handling (PR preprocessor/123273) -- provide libatomic-static from gcc subpackage +* Wed Sep 7 2022 Kalev Lember 12.2.1-2 +- enable GDC on aarch64 -* Sat Jan 3 2026 Jakub Jelinek 16.0.0-0.4 -- update from trunk - - PRs ada/123060, ada/123088, ada/123185, ada/123289, ada/123302, - ada/123306, ada/15605, c++/117518, c++/119097, c++/120005, c++/121864, - c++/122550, c++/122690, c++/122712, c++/122819, c++/122958, - c++/122994, c++/123080, c++/123261, c++/123277, fortran/101399, - fortran/121472, fortran/121475, fortran/122957, fortran/123201, - fortran/123253, libfortran/119136, middle-end/123067, - middle-end/123222, other/122243, rtl-optimization/123114, - rtl-optimization/123267, rtl-optimization/123276, - rtl-optimization/123295, rtl-optimization/123308, target/121485, - target/122769, target/123216, target/123217, target/123274, - target/123278, target/123283, target/123318, testsuite/123299, - testsuite/123334, tree-optimization/123089 -- require libatomic package from gcc package as -latomic is now linked - as-needed by default -- remove libatomic-static package, move libatomic.a into gcc package +* Fri Aug 19 2022 Jakub Jelinek 12.2.1-1 +- update from releases/gcc-12 branch + - GCC 12.2 release + - PRs c++/67048, c++/106369, c/106016, d/106623, d/106638, lto/106334, + lto/106540, middle-end/106492, tree-optimization/106513 +- fix an if-conversion wrong-code bug (PR rtl-optimization/106590) +- implement C++23 P2327R1 - de-deprecating volatile compound operations - as + a DR -* Sat Dec 20 2025 Jakub Jelinek 16.0.0-0.3 -- update from trunk - - PRs bootstrap/12407, c/123156, c++/91388, c++/117034, c++/122070, - c++/122509, c++/122690, c++/122712, c++/122772, c++/122834, - c++/122922, c++/122995, c++/123030, c++/123044, c++/123186, - debug/122968, fortran/71565, fortran/92613, libstdc++/112591, - libstdc++/123147, libstdc++/123180, rtl-optimization/123223, - target/55212, target/122970, target/123171, target/123216, - target/123217, tree-optimization/122734, tree-optimization/123097, - tree-optimization/123117, tree-optimization/123118, - tree-optimization/123152, tree-optimization/123153, - tree-optimization/123192, tree-optimization/123205 +* Wed Aug 10 2022 Jakub Jelinek 12.1.1-4 +- update from releases/gcc-12 branch + - PRs analyzer/105285, analyzer/106204, analyzer/106225, c++/53164, + c++/96363, c++/100374, c++/105541, c++/105626, c++/105634, c++/105637, + c++/105758, c++/105842, c++/105848, c++/105912, c++/106024, + c++/106102, c++/106230, c++/106311, c++/106361, d/106139, d/106555, + d/106563, debug/106261, fortran/101330, fortran/103137, + fortran/103138, fortran/103504, fortran/103693, fortran/104313, + fortran/105243, fortran/105691, fortran/105813, fortran/105954, + fortran/106121, libfortran/106079, libstdc++/88881, libstdc++/100823, + libstdc++/104443, libstdc++/105844, libstdc++/105880, + libstdc++/105957, libstdc++/105995, libstdc++/106162, + libstdc++/106248, lto/106129, middle-end/105965, middle-end/106027, + middle-end/106144, middle-end/106331, middle-end/106449, + preprocessor/97498, rtl-optimization/105041, rtl-optimization/106032, + target/103722, target/105459, target/105930, target/105991, + target/106091, target/106097, target/106122, testsuite/106345, + tree-optimization/105665, tree-optimization/105860, + tree-optimization/105946, tree-optimization/105969, + tree-optimization/105971, tree-optimization/106063, + tree-optimization/106087, tree-optimization/106112, + tree-optimization/106114, tree-optimization/106131, + tree-optimization/106189 -* Thu Dec 18 2025 Jakub Jelinek 16.0.0-0.2 +* Thu Jun 30 2022 Jakub Jelinek 12.1.1-3 +- fix up libtsan on s390x + +* Tue Jun 28 2022 Jakub Jelinek 12.1.1-2 +- update from releases/gcc-12 branch + - PRs c++/49387, c++/102307, c++/102651, c++/104470, c++/105491, c++/105589, + c++/105623, c++/105652, c++/105655, c++/105725, c++/105734, + c++/105756, c++/105761, c++/105779, c++/105795, c++/105852, + c++/105871, c++/105885, c++/105908, c++/105925, c++/105931, + c++/105964, c++/106001, c/105635, d/105544, fortran/105230, + gcov-profile/105535, ipa/100413, ipa/105600, ipa/105639, ipa/105739, + libgomp/105745, libgomp/106045, libstdc++/104731, libstdc++/105284, + libstdc++/105671, libstdc++/105681, middle-end/105537, + middle-end/105604, middle-end/105711, middle-end/105951, + middle-end/105998, middle-end/106030, other/105527, + preprocessor/105732, rtl-optimization/105455, rtl-optimization/105559, + rtl-optimization/105577, sanitizer/105714, sanitizer/105729, + target/101891, target/104871, target/105162, target/105209, + target/105292, target/105472, target/105556, target/105599, + target/105854, target/105879, target/105953, target/105960, + target/105970, target/105981, target/106096, tree-optimization/103116, + tree-optimization/105431, tree-optimization/105458, + tree-optimization/105528, tree-optimization/105562, + tree-optimization/105618, tree-optimization/105726, + tree-optimization/105736, tree-optimization/105786, + tree-optimization/105940 +- enable tsan and lsan on s390x (#2101610) +- trim RHEL fortran patches +- fix nvptx build (PRs bootstrap/105551, target/105938) + +* Sat May 7 2022 Jakub Jelinek 12.1.1-1 +- update from releases/gcc-12 branch + - GCC 12.1 release + - PRs c++/105476, libstdc++/103911, libstdc++/105441, libstdc++/105502, + middle-end/105376, middle-end/105461, target/102059, testsuite/105433, + tree-optimization/105394, tree-optimization/105437, + tree-optimization/105484 + +* Thu May 5 2022 Stephen Gallagher 12.0.1-0.18 +- fix annobin plugin conditional to build for ELN + +* Fri Apr 29 2022 Jakub Jelinek 12.0.1-0.17 +- update from trunk and releases/gcc-12 branch + - GCC 12.1-rc1 + - PRs analyzer/105252, analyzer/105264, analyzer/105365, analyzer/105366, + c++/65211, c++/82980, c++/86193, c++/90107, c++/97219, c++/100838, + c++/101442, c++/101698, c++/102629, c++/102804, c++/102987, + c++/103868, c++/104051, c++/104624, c++/104646, c++/104996, + c++/105256, c++/105265, c++/105268, c++/105287, c++/105289, + c++/105297, c++/105301, c++/105304, c++/105321, c++/105322, + c++/105353, c++/105386, c++/105398, c++/105425, c++/105426, + debug/105089, debug/105203, fortran/70673, fortran/78054, + fortran/102043, fortran/103662, fortran/104717, fortran/105242, + fortran/105310, fortran/105379, fortran/105381, gcov-profile/105282, + ipa/103818, ipa/105306, libgomp/105358, libstdc++/93602, + libstdc++/99290, libstdc++/102994, libstdc++/104858, + libstdc++/105269, libstdc++/105324, libstdc++/105375, + libstdc++/105417, lto/105364, lto/105399, middle-end/104492, + rtl-optimization/105231, rtl-optimization/105314, + rtl-optimization/105333, sanitizer/105396, target/89125, + target/103197, target/104676, target/105247, target/105257, + target/105271, target/105331, target/105334, target/105338, + target/105339, target/105349, target/105367, testsuite/105266, + tree-optimization/100810, tree-optimization/103941, + tree-optimization/104010, tree-optimization/105219, + tree-optimization/105254, tree-optimization/105276, + tree-optimization/105312, tree-optimization/105368, + tree-optimization/105374 + +* Wed Apr 13 2022 Jakub Jelinek 12.0.1-0.16 +- update from trunk + - PRs c++/97296, c++/98249, c++/100111, c++/103105, c++/104142, c++/104669, + c++/105223, c++/105233, c++/105245, jit/104071, jit/104072, + jit/104073, jit/104293, middle-end/105253, middle-end/105259, + rtl-optimization/105211, target/95325, target/97348, target/101755, + target/102146, target/103623, target/104144, target/104894, + target/105213, target/105214, target/105234, testsuite/105183, + tree-optimization/104912, tree-optimization/105226, + tree-optimization/105232, tree-optimization/105235, + tree-optimization/105250, tree-optimization/105263 + +* Mon Apr 11 2022 Jakub Jelinek 12.0.1-0.15 +- update from trunk + - PRs analyzer/102208, analyzer/103892, c++/91618, c++/92385, c++/96604, + c++/96645, c++/99479, c++/100370, c++/100608, c++/101051, c++/101677, + c++/101717, c++/101894, c++/103328, c++/103852, c++/104668, + c++/104702, c++/105110, c++/105143, c++/105186, c++/105187, + c++/105191, c/105149, c/105151, d/104740, driver/105096, + fortran/104210, fortran/105138, fortran/105184, ipa/103376, + ipa/104303, ipa/105166, jit/102824, libstdc++/105031, + libstdc++/105128, libstdc++/105146, libstdc++/105153, + libstdc++/105154, middle-end/105140, middle-end/105165, + rtl-optimization/104985, target/101908, target/102024, target/103147, + target/104049, target/104253, target/104409, target/104853, + target/104897, target/104987, target/105002, target/105069, + target/105123, target/105139, target/105144, target/105147, + target/105157, target/105197, testsuite/103196, testsuite/105095, + testsuite/105122, testsuite/105196, tree-optimization/102586, + tree-optimization/103761, tree-optimization/104639, + tree-optimization/104645, tree-optimization/105132, + tree-optimization/105142, tree-optimization/105148, + tree-optimization/105150, tree-optimization/105163, + tree-optimization/105173, tree-optimization/105175, + tree-optimization/105185, tree-optimization/105189, + tree-optimization/105198, tree-optimization/105218 +- build annobin gcc plugin as part of gcc build into gcc-plugin-annobin + subpackage + +* Sun Apr 3 2022 Jakub Jelinek 12.0.1-0.14 +- update from trunk + - revert delayed parse DMI change (PR c++/96645) +- fix up aarch64 make install + +* Fri Apr 1 2022 Jakub Jelinek 12.0.1-0.13 +- update from trunk + - PRs ada/104767, ada/104861, analyzer/95000, analyzer/99771, + analyzer/103533, analyzer/104308, analyzer/104793, analyzer/104863, + analyzer/104943, analyzer/104954, analyzer/104955, analyzer/104979, + analyzer/104997, analyzer/105017, analyzer/105057, analyzer/105074, + analyzer/105087, c++/39751, c++/58646, c++/59426, c++/65396, + c++/71637, c++/84964, c++/87820, c++/92918, c++/93280, c++/95999, + c++/96329, c++/96437, c++/96440, c++/96645, c++/96780, c++/98644, + c++/99445, c++/100474, c++/101030, c++/101515, c++/101767, c++/102045, + c++/102071, c++/102123, c++/102137, c++/102489, c++/102538, + c++/102740, c++/102869, c++/102990, c++/103177, c++/103291, + c++/103299, c++/103337, c++/103455, c++/103460, c++/103769, + c++/103943, c++/103968, c++/104008, c++/104108, c++/104284, + c++/104476, c++/104527, c++/104568, c++/104583, c++/104608, + c++/104620, c++/104622, c++/104623, c++/104641, c++/104752, + c++/104806, c++/104823, c++/104846, c++/104847, c++/104944, + c++/104994, c++/105003, c++/105006, c++/105035, c++/105050, + c++/105061, c++/105064, c++/105067, c++/105092, c/82283, c/84685, + c/98198, c/104711, d/103528, d/104911, d/105004, debug/104564, + debug/104778, fortran/50549, fortran/100892, fortran/103039, + fortran/103560, fortran/103691, fortran/104126, fortran/104570, + fortran/104571, fortran/104811, fortran/104849, fortran/104999, + ipa/102513, ipa/103083, ipa/103171, ipa/104813, jit/63854, + libgcc/86224, libgomp/105042, libstdc++/92546, libstdc++/103407, + libstdc++/104242, libstdc++/104859, libstdc++/104866, + libstdc++/104870, libstdc++/104875, libstdc++/104990, + libstdc++/105021, libstdc++/105027, lto/102426, middle-end/90115, + middle-end/98420, middle-end/99578, middle-end/100680, + middle-end/102330, middle-end/103597, middle-end/104086, + middle-end/104285, middle-end/104436, middle-end/104774, + middle-end/104786, middle-end/104869, middle-end/104885, + middle-end/104892, middle-end/104966, middle-end/104971, + middle-end/104975, middle-end/105032, middle-end/105049, other/65095, + other/102664, other/104899, other/105114, rtl-optimization/103775, + rtl-optimization/104814, rtl-optimization/104961, + rtl-optimization/104989, rtl-optimization/105028, + rtl-optimization/105091, sanitizer/105093, target/86722, target/91229, + target/94680, target/96882, target/99754, target/102125, + target/102215, target/102772, target/102986, target/103074, + target/104004, target/104666, target/104688, target/104714, + target/104762, target/104783, target/104790, target/104815, + target/104818, target/104829, target/104840, target/104842, + target/104857, target/104868, target/104882, target/104890, + target/104898, target/104902, target/104903, target/104910, + target/104916, target/104923, target/104925, target/104946, + target/104952, target/104957, target/104963, target/104967, + target/104974, target/104976, target/104977, target/104978, + target/104982, target/104998, target/105000, target/105011, + target/105052, target/105058, target/105066, target/105068, + testsuite/102841, testsuite/104759, testsuite/105055, + testsuite/105085, tree-optimization/80334, tree-optimization/84201, + tree-optimization/90356, tree-optimization/98335, + tree-optimization/100834, tree-optimization/101895, + tree-optimization/102008, tree-optimization/102586, + tree-optimization/102645, tree-optimization/102943, + tree-optimization/104645, tree-optimization/104755, + tree-optimization/104851, tree-optimization/104880, + tree-optimization/104941, tree-optimization/104942, + tree-optimization/104960, tree-optimization/104970, + tree-optimization/105012, tree-optimization/105053, + tree-optimization/105056, tree-optimization/105070, + tree-optimization/105080, tree-optimization/105094, + tree-optimization/105109 + +* Tue Mar 8 2022 Jakub Jelinek 12.0.1-0.12 +- fix up promoted SUBREG handling (#2045160, PR rtl-optimization/104839) +- fix up check for asm goto (PR rtl-optimization/104777) + +* Tue Mar 8 2022 Jakub Jelinek 12.0.1-0.11 +- update from trunk + - PRs analyzer/101983, fortran/99585, fortran/104430, libstdc++/104807, + middle-end/104381, target/99297, target/104779, target/104794, + target/104797, translation/90148, translation/104552, + tree-optimization/104782, tree-optimization/104825 +- fix build on i686 where gnat1 was hanging (PR target/104838, + PR target/104781) + +* Sun Mar 6 2022 Jakub Jelinek 12.0.1-0.10 +- update from trunk + - PRs analyzer/103521, analyzer/104434, c++/70077, c++/79493, c++/103443, + c++/104618, c++/104667, c++/104682, c/104627, c/104633, d/104659, + d/104736, debug/100541, fortran/84519, fortran/104131, fortran/104573, + fortran/104619, gcov-profile/104677, ipa/104533, ipa/104648, + libstdc++/96526, libstdc++/104602, libstdc++/104748, middle-end/80270, + middle-end/100400, middle-end/102276, middle-end/103836, + middle-end/103984, middle-end/104061, middle-end/104132, + middle-end/104133, middle-end/104529, middle-end/104540, + middle-end/104550, middle-end/104558, middle-end/104679, + middle-end/104721, middle-end/104757, middle-end/104761, + middle-end/104784, rtl-optimization/104154, rtl-optimization/104589, + rtl-optimization/104637, rtl-optimization/104686, target/87496, + target/88134, target/99555, target/100757, target/101325, + target/102429, target/103302, target/104121, target/104208, + target/104489, target/104656, target/104664, target/104674, + target/104681, target/104698, target/104704, target/104724, + target/104726, target/104758, testsuite/100407, testsuite/104687, + testsuite/104725, testsuite/104727, testsuite/104728, + testsuite/104730, testsuite/104732, testsuite/104791, + tree-optimization/91384, tree-optimization/101636, + tree-optimization/103037, tree-optimization/103845, + tree-optimization/103856, tree-optimization/104601, + tree-optimization/104644, tree-optimization/104675, + tree-optimization/104676, tree-optimization/104700, + tree-optimization/104715, tree-optimization/104716 +- fix constraints on s390x conditional trap (PR target/104775) + +* Tue Feb 22 2022 Jakub Jelinek 12.0.1-0.9 +- update from trunk + - PRs analyzer/104524, analyzer/104560, analyzer/104576, c++/85493, + c++/90451, c++/94944, c++/95036, c++/104107, c++/104507, c++/104539, + c++/104565, c/104506, c/104510, c/104531, c/104532, debug/104517, + debug/104557, fortran/77693, fortran/104211, libstdc++/104542, + libstdc++/104559, lto/104617, middle-end/104355, middle-end/104522, + rtl-optimization/104447, rtl-optimization/104498, + rtl-optimization/104544, sanitizer/102656, target/99708, target/99881, + target/100056, target/100874, target/103069, target/104253, + target/104257, target/104335, target/104440, target/104448, + target/104536, target/104581, target/104598, target/104612, + testsuite/104146, tree-optimization/96881, tree-optimization/103771, + tree-optimization/104519, tree-optimization/104526, + tree-optimization/104543, tree-optimization/104551, + tree-optimization/104582, tree-optimization/104604 + +* Mon Feb 14 2022 Jakub Jelinek 12.0.1-0.8 +- update from trunk + - PRs ada/97504, ada/98724, c/104505, fortran/104228, libstdc++/100912, + middle-end/104497, tree-optimization/104511, tree-optimization/104528 + - fix handling of return in arm constexpr ctors and on all arches return in + constexpr dtors (PR c++/104513) + +* Sat Feb 12 2022 Jakub Jelinek 12.0.1-0.7 +- update from trunk + - PRs analyzer/98797, analyzer/101081, analyzer/102052, analyzer/103872, + analyzer/104274, analyzer/104417, analyzer/104452, c++/80951, + c++/96242, c++/96876, c++/102204, c++/103706, c++/103752, c++/104033, + c++/104379, c++/104403, c++/104410, c++/104425, c++/104432, + c++/104472, c/104427, debug/104407, fortran/66193, fortran/104329, + libgomp/104385, libstdc++/104442, middle-end/100775, + middle-end/104402, middle-end/104446, middle-end/104450, + middle-end/104464, middle-end/104467, middle-end/104496, + rtl-optimization/104059, rtl-optimization/104153, + rtl-optimization/104198, rtl-optimization/104400, + rtl-optimization/104459, sanitizer/104449, target/35513, target/79754, + target/97005, target/97040, target/100593, target/102140, + target/103627, target/104117, target/104283, target/104327, + target/104345, target/104364, target/104441, target/104451, + target/104453, target/104456, target/104458, target/104462, + target/104469, target/104474, target/104502, testsuite/104481, + tree-optimization/102832, tree-optimization/104288, + tree-optimization/104373, tree-optimization/104420, + tree-optimization/104445, tree-optimization/104466, + tree-optimization/104479, tree-optimization/104499 + +* Sat Feb 5 2022 Jakub Jelinek 12.0.1-0.6 +- update from trunk + - PRs analyzer/104369, c++/92385, c++/104079, c++/104300, c++/104302, + debug/104337, debug/104366, fortran/104311, fortran/104328, + middle-end/90348, middle-end/104092, middle-end/104260, + rtl-optimization/101885, target/95082, target/100808, target/103686, + target/104219, target/104362, target/104380, tree-optimization/103641, + tree-optimization/104119, tree-optimization/104356, + tree-optimization/104389 + +* Wed Feb 2 2022 Jakub Jelinek 12.0.1-0.5 +- update from trunk + - PRs analyzer/104270, c++/101874, c++/102414, c++/102434, c++/103186, + c++/104291, c++/104294, d/104287, demangler/98886, demangler/99935, + fortran/104331, libstdc++/101831, libstdc++/104301, lto/104333, + middle-end/104232, middle-end/104307, middle-end/95115, + preprocessor/104147, rtl-optimization/101260, target/94372, + target/100428, target/104189, target/104298, target/104323, + tree-optimization/95424, tree-optimization/100499, + tree-optimization/102819, tree-optimization/103169, + tree-optimization/103514, tree-optimization/104279, + tree-optimization/104280, tree-optimization/104281 +- fix a VRP bug with 1-3 bit precision types (PR tree-optimization/104334) + +* Sat Jan 29 2022 Jakub Jelinek 12.0.1-0.4 +- update from trunk + - PRs ada/104258, analyzer/104224, analyzer/104247, bootstrap/67102, + c++/51344, c++/59950, c++/82632, c++/92752, c++/92944, c++/99895, + c++/100030, c++/100198, c++/100282, c++/101532, c++/101988, + c++/103057, c++/103341, c++/103678, c++/104206, c++/104225, + c++/104226, c++/104235, c++/104245, fortran/84784, fortran/103790, + fortran/104128, fortran/104212, fortran/104227, libfortran/104233, + libstdc++/100516, libstdc++/104161, libstdc++/104217, + libstdc++/104259, lto/104237, middle-end/103642, target/103702, + target/104201, target/104213, target/104239, testsuite/70230, + tree-optimization/104196, tree-optimization/104203, + tree-optimization/104263, tree-optimization/104267, web/104254 +- configure with --enable-libstdcxx-backtrace and package + libstdc++_libbacktrace.a + +* Tue Jan 25 2022 Jakub Jelinek 12.0.1-0.3 +- update from trunk + - PRs ada/103538, analyzer/94362, analyzer/103685, analyzer/104062, + analyzer/104089, analyzer/104150, analyzer/104159, bootstrap/104135, + bootstrap/104170, c++/20040, c++/55227, c++/91911, c++/101072, + c++/101405, c++/101715, c++/102300, c++/102338, c++/103631, + c++/103672, c++/103681, c++/104025, c++/104055, c++/104084, + c++/104134, c++/104139, c++/104148, c++/104173, c++/104182, + c++/104197, c/104115, debug/103874, fortran/102621, fortran/103695, + fortran/104127, libgcc/104207, libstdc++/87193, libstdc++/104019, + libstdc++/104032, libstdc++/104099, libstdc++/104101, + libstdc++/104123, libstdc++/104174, middle-end/100786, + middle-end/102860, middle-end/104069, middle-end/104076, + middle-end/104140, other/104176, other/104181, preprocessor/104030, + rtl-optimization/102478, sanitizer/99673, sanitizer/104158, + target/64821, target/94193, target/100784, target/102517, + target/103676, target/103771, target/104090, target/104136, + target/104188, testsuite/102833, testsuite/103763, testsuite/104021, + testsuite/104022, testsuite/104109, tree-optimization/100089, + tree-optimization/100740, tree-optimization/101508, + tree-optimization/101972, tree-optimization/102087, + tree-optimization/102131, tree-optimization/103721, + tree-optimization/103997, tree-optimization/104112, + tree-optimization/104114, tree-optimization/104152, + tree-optimization/104156, tree-optimization/104214 + - don't emit C++ mangling aliases for compatibility with GCC 8.1 ppc64le + IEEE quad long double (PR target/104172) +- mark IEEE quad long double in DWARF as implicit typedef to _Float128 + (PR debug/104194) + +* Tue Jan 18 2022 Jakub Jelinek 12.0.1-0.2 +- update from trunk + - PRs c++/104007, c++/104074, fortran/103692, ipa/103989, libstdc++/101124, + libstdc++/104098, middle-end/103163, tree-optimization/103987, + tree-optimization/104038 +- default to -mabi=ieeelongdouble on ppc64le +- fix -Wdangling-pointer with -fsanitize=address (PR middle-end/104103) +- fix -masm=intel (PR target/104104) + +* Tue Jan 18 2022 Jakub Jelinek 12.0.1-0.1 +- update from trunk + - PRs c++/104031, c/63272, fortran/83079, fortran/87711, fortran/97896, + libstdc++/103650, libstdc++/104080, middle-end/101292, target/103124, + target/103973, target/104005, testsuite/104035, testsuite/104037, + tree-optimization/80532, tree-optimization/101941, + tree-optimization/104064 + +* Sat Jan 15 2022 Jakub Jelinek 12.0.0-0.5 +- update from trunk + - PRs ada/104027, analyzer/104029, c++/70417, c++/103705, c++/103991, + c/104002, fortran/67804, fortran/99256, fortran/103782, + libfortran/104006, libstdc++/91260, libstdc++/91383, libstdc++/95065, + libstdc++/103992, middle-end/100280, middle-end/101475, + middle-end/104026, target/94790, target/98737, target/100637, + target/103935, target/103941, target/104001, target/104003, + target/104014, tree-optimization/83072, tree-optimization/83073, + tree-optimization/96707, tree-optimization/97909, + tree-optimization/102192, tree-optimization/103989, + tree-optimization/104009, tree-optimization/104015 +- include rs6000-vecdefines.h on ppc* (#2040825) + +* Wed Jan 12 2022 Jakub Jelinek 12.0.0-0.4 +- update from trunk + - PRs ada/79724, analyzer/102692, analyzer/103940, c++/89074, c++/103480, + c++/100588, c++/101597, c++/103783, c++/103831, c++/103879, + c++/103912, c++/103946, c/101537, c/103881, fortran/82207, + fortran/101762, fortran/103366, fortran/103777, fortran/103789, + libstdc++/77760, libstdc++/100017, libstdc++/103726, libstdc++/103866, + libstdc++/103891, libstdc++/103955, middle-end/70090, + middle-end/101530, rtl-optimization/98782, rtl-optimization/103974, + target/53652, target/102024, target/102239, target/103465, + target/103804, target/103861, testsuite/102935, testsuite/103820, + tree-optimization/76174, tree-optimization/83541, + tree-optimization/100359, tree-optimization/103551, + tree-optimization/103821, tree-optimization/103948, + tree-optimization/103961, tree-optimization/103971, + tree-optimization/103977, tree-optimization/103990 + +* Sat Jan 8 2022 Jakub Jelinek 12.0.0-0.3 - new package diff --git a/gcc16-Wno-format-security.patch b/gcc12-Wno-format-security.patch similarity index 57% rename from gcc16-Wno-format-security.patch rename to gcc12-Wno-format-security.patch index 2a4f0f3..43e482a 100644 --- a/gcc16-Wno-format-security.patch +++ b/gcc12-Wno-format-security.patch @@ -9,15 +9,15 @@ * configure: Regenerated. --- gcc/configure.ac.jj 2017-02-13 12:20:53.000000000 +0100 -+++ gcc/configure.ac 2024-11-30 13:34:11.100296256 +0100 -@@ -592,7 +592,7 @@ AC_ARG_ENABLE(build-format-warnings, ++++ gcc/configure.ac 2017-02-25 12:42:32.859175403 +0100 +@@ -570,7 +570,7 @@ AC_ARG_ENABLE(build-format-warnings, AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]), [],[enable_build_format_warnings=yes]) AS_IF([test $enable_build_format_warnings = no], - [wf_opt=-Wno-format],[wf_opt=]) + [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=]) ACX_PROG_CXX_WARNING_OPTS( - m4_quote(m4_do([-W -Wall -Wno-error=narrowing -Wwrite-strings ], + m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ], [-Wcast-qual $wf_opt])), --- gcc/configure.jj 2017-02-13 12:20:52.000000000 +0100 +++ gcc/configure 2017-02-25 12:42:50.041946391 +0100 @@ -30,37 +30,29 @@ else wf_opt= fi ---- Makefile.tpl.jj 2023-11-29 13:21:41.680292662 +0100 -+++ Makefile.tpl 2024-11-30 13:35:29.303196246 +0100 -@@ -450,10 +450,10 @@ LDFLAGS = @LDFLAGS@ +--- Makefile.tpl.jj 2021-12-30 15:12:42.188164847 +0100 ++++ Makefile.tpl 2022-01-07 12:06:12.115550714 +0100 +@@ -447,8 +447,8 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -GOCFLAGS = $(CFLAGS) --A68FLAGS = @A68FLAGS@ --GDCFLAGS = @GDCFLAGS@ --GM2FLAGS = $(CFLAGS) +-GDCFLAGS = $(CFLAGS) +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS)) -+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@) -+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@) -+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS)) ++GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS)) - CRAB1_LIBS = @CRAB1_LIBS@ - ---- Makefile.in.jj 2023-11-29 13:21:41.691292507 +0100 -+++ Makefile.in 2024-11-30 13:36:12.113594079 +0100 -@@ -447,10 +447,10 @@ LDFLAGS = @LDFLAGS@ + # Pass additional PGO and LTO compiler options to the PGO build. + BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) +--- Makefile.in.jj 2021-12-30 15:12:42.188164847 +0100 ++++ Makefile.in 2022-01-07 12:06:27.335334561 +0100 +@@ -444,8 +444,8 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -GOCFLAGS = $(CFLAGS) --A68FLAGS = @A68FLAGS@ --GDCFLAGS = @GDCFLAGS@ --GM2FLAGS = $(CFLAGS) +-GDCFLAGS = $(CFLAGS) +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS)) -+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@) -+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@) -+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS)) - - CRAB1_LIBS = @CRAB1_LIBS@ ++GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS)) + # Pass additional PGO and LTO compiler options to the PGO build. + BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) diff --git a/gcc16-d-shared-libphobos.patch b/gcc12-d-shared-libphobos.patch similarity index 100% rename from gcc16-d-shared-libphobos.patch rename to gcc12-d-shared-libphobos.patch diff --git a/gcc16-fortran-fdec-duplicates.patch b/gcc12-fortran-fdec-duplicates.patch similarity index 100% rename from gcc16-fortran-fdec-duplicates.patch rename to gcc12-fortran-fdec-duplicates.patch diff --git a/gcc12-fortran-fdec-non-logical-if.patch b/gcc12-fortran-fdec-non-logical-if.patch new file mode 100644 index 0000000..a3a830c --- /dev/null +++ b/gcc12-fortran-fdec-non-logical-if.patch @@ -0,0 +1,378 @@ +From cc87ddb841017bb0976b05091733609ee17d7f05 Mon Sep 17 00:00:00 2001 +From: Mark Eggleston +Date: Fri, 22 Jan 2021 13:15:17 +0000 +Subject: [PATCH 07/10] Allow non-logical expressions in IF statements + +Use -fdec-non-logical-if to enable feature. Also enabled using -fdec. +--- + gcc/fortran/lang.opt | 4 ++ + gcc/fortran/options.cc | 1 + + gcc/fortran/resolve.cc | 60 ++++++++++++++++--- + ...gical_expressions_if_statements_blocks_1.f | 25 ++++++++ + ...gical_expressions_if_statements_blocks_2.f | 25 ++++++++ + ...gical_expressions_if_statements_blocks_3.f | 25 ++++++++ + ...gical_expressions_if_statements_blocks_4.f | 45 ++++++++++++++ + ...gical_expressions_if_statements_blocks_5.f | 45 ++++++++++++++ + ...gical_expressions_if_statements_blocks_6.f | 45 ++++++++++++++ + 9 files changed, 266 insertions(+), 9 deletions(-) + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f + +diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt +index 4a269ebb22d..d886c2f33ed 100644 +--- a/gcc/fortran/lang.opt ++++ b/gcc/fortran/lang.opt +@@ -506,6 +506,10 @@ fdec-override-kind + Fortran Var(flag_dec_override_kind) + Enable support for per variable kind specification. + ++fdec-non-logical-if ++Fortran Var(flag_dec_non_logical_if) ++Enable support for non-logical expressions in if statements. ++ + fdec-structure + Fortran Var(flag_dec_structure) + Enable support for DEC STRUCTURE/RECORD. +diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc +index edbab483b36..a946c86790a 100644 +--- a/gcc/fortran/options.cc ++++ b/gcc/fortran/options.cc +@@ -79,6 +79,7 @@ set_dec_flags (int value) + SET_BITFLAG (flag_dec_char_conversions, value, value); + SET_BITFLAG (flag_dec_duplicates, value, value); + SET_BITFLAG (flag_dec_override_kind, value, value); ++ SET_BITFLAG (flag_dec_non_logical_if, value, value); + } + + /* Finalize DEC flags. */ +diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc +index bc0df0fdb99..07dd039f3bf 100644 +--- a/gcc/fortran/resolve.cc ++++ b/gcc/fortran/resolve.cc +@@ -10789,10 +10789,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_namespace *ns) + switch (b->op) + { + case EXEC_IF: +- if (t && b->expr1 != NULL +- && (b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0)) +- gfc_error ("IF clause at %L requires a scalar LOGICAL expression", +- &b->expr1->where); ++ if (t && b->expr1 != NULL) ++ { ++ if (flag_dec_non_logical_if && b->expr1->ts.type != BT_LOGICAL) ++ { ++ gfc_expr* cast; ++ cast = gfc_ne (b->expr1, ++ gfc_get_int_expr (1, &gfc_current_locus, 0), ++ INTRINSIC_NE); ++ if (cast == NULL) ++ gfc_internal_error ("gfc_resolve_blocks(): Failed to cast " ++ "to LOGICAL in IF"); ++ b->expr1 = cast; ++ if (warn_conversion_extra) ++ { ++ gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in" ++ " IF statement condition %L will be true if" ++ " it evaluates to nonzero", ++ &b->expr1->where); ++ } ++ } ++ ++ if ((b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0)) ++ gfc_error ("IF clause at %L requires a scalar LOGICAL " ++ "expression", &b->expr1->where); ++ } + break; + + case EXEC_WHERE: +@@ -12093,11 +12114,32 @@ start: + break; + + case EXEC_IF: +- if (t && code->expr1 != NULL +- && (code->expr1->ts.type != BT_LOGICAL +- || code->expr1->rank != 0)) +- gfc_error ("IF clause at %L requires a scalar LOGICAL expression", +- &code->expr1->where); ++ if (t && code->expr1 != NULL) ++ { ++ if (flag_dec_non_logical_if ++ && code->expr1->ts.type != BT_LOGICAL) ++ { ++ gfc_expr* cast; ++ cast = gfc_ne (code->expr1, ++ gfc_get_int_expr (1, &gfc_current_locus, 0), ++ INTRINSIC_NE); ++ if (cast == NULL) ++ gfc_internal_error ("gfc_resolve_code(): Failed to cast " ++ "to LOGICAL in IF"); ++ code->expr1 = cast; ++ if (warn_conversion_extra) ++ { ++ gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in" ++ " IF statement condition %L will be true if" ++ " it evaluates to nonzero", ++ &code->expr1->where); ++ } ++ } ++ ++ if (code->expr1->ts.type != BT_LOGICAL || code->expr1->rank != 0) ++ gfc_error ("IF clause at %L requires a scalar LOGICAL " ++ "expression", &code->expr1->where); ++ } + break; + + case EXEC_CALL: +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f +new file mode 100644 +index 00000000000..0101db893ca +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f +@@ -0,0 +1,25 @@ ++! { dg-do run } ++! { dg-options "-fdec -Wconversion-extra" } ++! ++! Allow logical expressions in if statements and blocks ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ PROGRAM logical_exp_if_st_bl ++ INTEGER ipos/1/ ++ INTEGER ineg/0/ ++ ++ ! Test non logical variables ++ if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" } ++ if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" } ++ ++ ! Test non logical expressions in if statements ++ if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" } ++ ++ ! Test non logical expressions in if blocks ++ if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" } ++ STOP 4 ++ endif ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f +new file mode 100644 +index 00000000000..876f4e09508 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f +@@ -0,0 +1,25 @@ ++! { dg-do run } ++! { dg-options "-fdec-non-logical-if -Wconversion-extra" } ++! ++! Allow logical expressions in if statements and blocks ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ PROGRAM logical_exp_if_st_bl ++ INTEGER ipos/1/ ++ INTEGER ineg/0/ ++ ++ ! Test non logical variables ++ if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" } ++ if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" } ++ ++ ! Test non logical expressions in if statements ++ if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" } ++ ++ ! Test non logical expressions in if blocks ++ if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" } ++ STOP 4 ++ endif ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f +new file mode 100644 +index 00000000000..35cb4c51b8d +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f +@@ -0,0 +1,25 @@ ++! { dg-do compile } ++! { dg-options "-fdec -fno-dec-non-logical-if" } ++! ++! Allow logical expressions in if statements and blocks ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ PROGRAM logical_exp_if_st_bl ++ INTEGER ipos/1/ ++ INTEGER ineg/0/ ++ ++ ! Test non logical variables ++ if (ineg) STOP 1 ! { dg-error "IF clause at" } ++ if (0) STOP 2 ! { dg-error "IF clause at" } ++ ++ ! Test non logical expressions in if statements ++ if (MOD(ipos, 1)) STOP 3 ! { dg-error "IF clause at" } ++ ++ ! Test non logical expressions in if blocks ++ if (MOD(2 * ipos, 2)) then ! { dg-error "IF clause at" } ++ STOP 4 ++ endif ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f +new file mode 100644 +index 00000000000..7b60b60827f +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f +@@ -0,0 +1,45 @@ ++! { dg-do run } ++! { dg-options "-fdec -Wconversion-extra" } ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ function othersub1() ++ integer*4 othersub1 ++ othersub1 = 9 ++ end ++ ++ function othersub2() ++ integer*4 othersub2 ++ othersub2 = 0 ++ end ++ ++ program MAIN ++ integer*4 othersub1 ++ integer*4 othersub2 ++ integer a /1/ ++ integer b /2/ ++ ++ if (othersub1()) then ! { dg-warning "if it evaluates to nonzero" } ++ write(*,*) "OK" ++ else ++ stop 1 ++ end if ++ if (othersub2()) then ! { dg-warning "if it evaluates to nonzero" } ++ stop 2 ++ else ++ write(*,*) "OK" ++ end if ++ if (a-b) then ! { dg-warning "if it evaluates to nonzero" } ++ write(*,*) "OK" ++ else ++ stop 3 ++ end if ++ if (b-(a+1)) then ! { dg-warning "if it evaluates to nonzero" } ++ stop 3 ++ else ++ write(*,*) "OK" ++ end if ++ end ++ +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f +new file mode 100644 +index 00000000000..80336f48ca1 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f +@@ -0,0 +1,45 @@ ++! { dg-do run } ++! { dg-options "-fdec-non-logical-if -Wconversion-extra" } ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ function othersub1() ++ integer*4 othersub1 ++ othersub1 = 9 ++ end ++ ++ function othersub2() ++ integer*4 othersub2 ++ othersub2 = 0 ++ end ++ ++ program MAIN ++ integer*4 othersub1 ++ integer*4 othersub2 ++ integer a /1/ ++ integer b /2/ ++ ++ if (othersub1()) then ! { dg-warning "Non-LOGICAL type in IF statement" } ++ write(*,*) "OK" ++ else ++ stop 1 ++ end if ++ if (othersub2()) then ! { dg-warning "Non-LOGICAL type in IF statement" } ++ stop 2 ++ else ++ write(*,*) "OK" ++ end if ++ if (a-b) then ! { dg-warning "Non-LOGICAL type in IF statement" } ++ write(*,*) "OK" ++ else ++ stop 3 ++ end if ++ if (b-(a+1)) then ! { dg-warning "Non-LOGICAL type in IF statement" } ++ stop 3 ++ else ++ write(*,*) "OK" ++ end if ++ end ++ +diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f +new file mode 100644 +index 00000000000..e1125ca717a +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f +@@ -0,0 +1,45 @@ ++! { dg-do compile } ++! { dg-options "-fdec -fno-dec-non-logical-if" } ++! ++! Contributed by Francisco Redondo Marchena ++! and Jeff Law ++! Modified by Mark Eggleston ++! ++ function othersub1() ++ integer*4 othersub1 ++ othersub1 = 9 ++ end ++ ++ function othersub2() ++ integer*4 othersub2 ++ othersub2 = 0 ++ end ++ ++ program MAIN ++ integer*4 othersub1 ++ integer*4 othersub2 ++ integer a /1/ ++ integer b /2/ ++ ++ if (othersub1()) then ! { dg-error "IF clause at" } ++ write(*,*) "OK" ++ else ++ stop 1 ++ end if ++ if (othersub2()) then ! { dg-error "IF clause at" } ++ stop 2 ++ else ++ write(*,*) "OK" ++ end if ++ if (a-b) then ! { dg-error "IF clause at" } ++ write(*,*) "OK" ++ else ++ stop 3 ++ end if ++ if (b-(a+1)) then ! { dg-error "IF clause at" } ++ stop 3 ++ else ++ write(*,*) "OK" ++ end if ++ end ++ +-- +2.27.0 + diff --git a/gcc12-fortran-fdec-override-kind.patch b/gcc12-fortran-fdec-override-kind.patch new file mode 100644 index 0000000..370fa56 --- /dev/null +++ b/gcc12-fortran-fdec-override-kind.patch @@ -0,0 +1,588 @@ +From 786869fd62813e80da9b6545a295d53c36275c19 Mon Sep 17 00:00:00 2001 +From: Mark Eggleston +Date: Fri, 22 Jan 2021 13:12:14 +0000 +Subject: [PATCH 06/10] Allow string length and kind to be specified on a per + variable basis. + +This allows kind/length to be mixed with array specification in +declarations. + +e.g. + + INTEGER*4 x*2, y*8 + CHARACTER names*20(10) + REAL v(100)*8, vv*4(50) + +The per-variable size overrides the kind or length specified for the type. + +Use -fdec-override-kind to enable. Also enabled by -fdec. + +Note: this feature is a merger of two previously separate features. + +Now accepts named constants as kind parameters: + + INTEGER A + PARAMETER (A=2) + INTEGER B*(A) + +Contributed by Mark Eggleston + +Now rejects invalid kind parameters and prints error messages: + + INTEGER X*3 + +caused an internal compiler error. + +Contributed by Mark Eggleston +--- + gcc/fortran/decl.cc | 156 ++++++++++++++---- + gcc/fortran/lang.opt | 4 + + gcc/fortran/options.cc | 1 + + .../dec_mixed_char_array_declaration_1.f | 13 ++ + .../dec_mixed_char_array_declaration_2.f | 13 ++ + .../dec_mixed_char_array_declaration_3.f | 13 ++ + .../gfortran.dg/dec_spec_in_variable_1.f | 31 ++++ + .../gfortran.dg/dec_spec_in_variable_2.f | 31 ++++ + .../gfortran.dg/dec_spec_in_variable_3.f | 31 ++++ + .../gfortran.dg/dec_spec_in_variable_4.f | 14 ++ + .../gfortran.dg/dec_spec_in_variable_5.f | 19 +++ + .../gfortran.dg/dec_spec_in_variable_6.f | 19 +++ + .../gfortran.dg/dec_spec_in_variable_7.f | 15 ++ + .../gfortran.dg/dec_spec_in_variable_8.f | 14 ++ + 14 files changed, 340 insertions(+), 34 deletions(-) + create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f + create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f + +diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc +index 5c8c1b7981b..f7dc9d8263d 100644 +--- a/gcc/fortran/decl.cc ++++ b/gcc/fortran/decl.cc +@@ -1213,6 +1213,54 @@ syntax: + return MATCH_ERROR; + } + ++/* This matches the nonstandard kind given after a variable name, like: ++ INTEGER x*2, y*4 ++ The per-variable kind will override any kind given in the type ++ declaration. ++*/ ++ ++static match ++match_per_symbol_kind (int *length) ++{ ++ match m; ++ gfc_expr *expr = NULL; ++ ++ m = gfc_match_char ('*'); ++ if (m != MATCH_YES) ++ return m; ++ ++ m = gfc_match_small_literal_int (length, NULL); ++ if (m == MATCH_YES || m == MATCH_ERROR) ++ return m; ++ ++ if (gfc_match_char ('(') == MATCH_NO) ++ return MATCH_ERROR; ++ ++ m = gfc_match_expr (&expr); ++ if (m == MATCH_YES) ++ { ++ m = MATCH_ERROR; // Assume error ++ if (gfc_expr_check_typed (expr, gfc_current_ns, false)) ++ { ++ if ((expr->expr_type == EXPR_CONSTANT) ++ && (expr->ts.type == BT_INTEGER)) ++ { ++ *length = mpz_get_si(expr->value.integer); ++ m = MATCH_YES; ++ } ++ } ++ ++ if (m == MATCH_YES) ++ { ++ if (gfc_match_char (')') == MATCH_NO) ++ m = MATCH_ERROR; ++ } ++ } ++ ++ if (expr != NULL) ++ gfc_free_expr (expr); ++ return m; ++} + + /* Special subroutine for finding a symbol. Check if the name is found + in the current name space. If not, and we're compiling a function or +@@ -2443,6 +2491,35 @@ check_function_name (char *name) + } + + ++static match ++match_character_length_clause (gfc_charlen **cl, bool *cl_deferred, int elem) ++{ ++ gfc_expr* char_len; ++ char_len = NULL; ++ ++ match m = match_char_length (&char_len, cl_deferred, false); ++ if (m == MATCH_YES) ++ { ++ *cl = gfc_new_charlen (gfc_current_ns, NULL); ++ (*cl)->length = char_len; ++ } ++ else if (m == MATCH_NO) ++ { ++ if (elem > 1 ++ && (current_ts.u.cl->length == NULL ++ || current_ts.u.cl->length->expr_type != EXPR_CONSTANT)) ++ { ++ *cl = gfc_new_charlen (gfc_current_ns, NULL); ++ (*cl)->length = gfc_copy_expr (current_ts.u.cl->length); ++ } ++ else ++ *cl = current_ts.u.cl; ++ ++ *cl_deferred = current_ts.deferred; ++ } ++ return m; ++} ++ + /* Match a variable name with an optional initializer. When this + subroutine is called, a variable is expected to be parsed next. + Depending on what is happening at the moment, updates either the +@@ -2453,7 +2530,7 @@ variable_decl (int elem) + { + char name[GFC_MAX_SYMBOL_LEN + 1]; + static unsigned int fill_id = 0; +- gfc_expr *initializer, *char_len; ++ gfc_expr *initializer; + gfc_array_spec *as; + gfc_array_spec *cp_as; /* Extra copy for Cray Pointees. */ + gfc_charlen *cl; +@@ -2462,11 +2539,15 @@ variable_decl (int elem) + match m; + bool t; + gfc_symbol *sym; ++ match cl_match; ++ match kind_match; ++ int overridden_kind; + char c; + + initializer = NULL; + as = NULL; + cp_as = NULL; ++ kind_match = MATCH_NO; + + /* When we get here, we've just matched a list of attributes and + maybe a type and a double colon. The next thing we expect to see +@@ -2519,6 +2600,28 @@ variable_decl (int elem) + + var_locus = gfc_current_locus; + ++ ++ cl = NULL; ++ cl_deferred = false; ++ cl_match = MATCH_NO; ++ ++ /* Check for a character length clause before an array clause */ ++ if (flag_dec_override_kind) ++ { ++ if (current_ts.type == BT_CHARACTER) ++ { ++ cl_match = match_character_length_clause (&cl, &cl_deferred, elem); ++ if (cl_match == MATCH_ERROR) ++ goto cleanup; ++ } ++ else ++ { ++ kind_match = match_per_symbol_kind (&overridden_kind); ++ if (kind_match == MATCH_ERROR) ++ goto cleanup; ++ } ++ } ++ + /* Now we could see the optional array spec. or character length. */ + m = gfc_match_array_spec (&as, true, true); + if (m == MATCH_ERROR) +@@ -2667,40 +2770,12 @@ variable_decl (int elem) + } + } + +- char_len = NULL; +- cl = NULL; +- cl_deferred = false; +- +- if (current_ts.type == BT_CHARACTER) ++ /* Second chance for a character length clause */ ++ if (cl_match == MATCH_NO && current_ts.type == BT_CHARACTER) + { +- switch (match_char_length (&char_len, &cl_deferred, false)) +- { +- case MATCH_YES: +- cl = gfc_new_charlen (gfc_current_ns, NULL); +- +- cl->length = char_len; +- break; +- +- /* Non-constant lengths need to be copied after the first +- element. Also copy assumed lengths. */ +- case MATCH_NO: +- if (elem > 1 +- && (current_ts.u.cl->length == NULL +- || current_ts.u.cl->length->expr_type != EXPR_CONSTANT)) +- { +- cl = gfc_new_charlen (gfc_current_ns, NULL); +- cl->length = gfc_copy_expr (current_ts.u.cl->length); +- } +- else +- cl = current_ts.u.cl; +- +- cl_deferred = current_ts.deferred; +- +- break; +- +- case MATCH_ERROR: +- goto cleanup; +- } ++ m = match_character_length_clause (&cl, &cl_deferred, elem); ++ if (m == MATCH_ERROR) ++ goto cleanup; + } + + /* The dummy arguments and result of the abreviated form of MODULE +@@ -2802,6 +2877,19 @@ variable_decl (int elem) + goto cleanup; + } + ++ if (kind_match == MATCH_YES) ++ { ++ gfc_find_symbol (name, gfc_current_ns, 1, &sym); ++ /* sym *must* be found at this point */ ++ sym->ts.kind = overridden_kind; ++ if (gfc_validate_kind (sym->ts.type, sym->ts.kind, true) < 0) ++ { ++ gfc_error ("Kind %d not supported for type %s at %C", ++ sym->ts.kind, gfc_basic_typename (sym->ts.type)); ++ return MATCH_ERROR; ++ } ++ } ++ + if (!check_function_name (name)) + { + m = MATCH_ERROR; +diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt +index 25cc948699b..4a269ebb22d 100644 +--- a/gcc/fortran/lang.opt ++++ b/gcc/fortran/lang.opt +@@ -502,6 +502,10 @@ fdec-math + Fortran Var(flag_dec_math) + Enable legacy math intrinsics for compatibility. + ++fdec-override-kind ++Fortran Var(flag_dec_override_kind) ++Enable support for per variable kind specification. ++ + fdec-structure + Fortran Var(flag_dec_structure) + Enable support for DEC STRUCTURE/RECORD. +diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc +index d6bd36c3a8a..edbab483b36 100644 +--- a/gcc/fortran/options.cc ++++ b/gcc/fortran/options.cc +@@ -78,6 +78,7 @@ set_dec_flags (int value) + SET_BITFLAG (flag_dec_blank_format_item, value, value); + SET_BITFLAG (flag_dec_char_conversions, value, value); + SET_BITFLAG (flag_dec_duplicates, value, value); ++ SET_BITFLAG (flag_dec_override_kind, value, value); + } + + /* Finalize DEC flags. */ +diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f +new file mode 100644 +index 00000000000..706ea4112a4 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f +@@ -0,0 +1,13 @@ ++! { dg-do run } ++! { dg-options "-fdec" } ++! ++! Test character declaration with mixed string length and array specification ++! ++! Contributed by Jim MacArthur ++! Modified by Mark Eggleston ++! ++ PROGRAM character_declaration ++ CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ++ CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/ ++ if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f +new file mode 100644 +index 00000000000..26d2acf01de +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f +@@ -0,0 +1,13 @@ ++! { dg-do run } ++! { dg-options "-fdec-override-kind" } ++! ++! Test character declaration with mixed string length and array specification ++! ++! Contributed by Jim MacArthur ++! Modified by Mark Eggleston ++! ++ PROGRAM character_declaration ++ CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ++ CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/ ++ if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f +new file mode 100644 +index 00000000000..76e4f0bdb93 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f +@@ -0,0 +1,13 @@ ++! { dg-do compile } ++! { dg-options "-fdec-override-kind -fno-dec-override-kind" } ++! ++! Test character declaration with mixed string length and array specification ++! ++! Contributed by Jim MacArthur ++! Modified by Mark Eggleston ++! ++ PROGRAM character_declaration ++ CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ! { dg-error "Syntax error" } ++ CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/ ++ if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ! { dg-error " Operands of comparison operator" } ++ END +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f +new file mode 100644 +index 00000000000..edd0f5874b7 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f +@@ -0,0 +1,31 @@ ++! { dg-do run } ++! { dg-options "-fdec" } ++! ++! Test kind specification in variable not in type ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer*8 ai*1, bi*4, ci ++ real*4 ar*4, br*8, cr ++ ++ ai = 1 ++ ar = 1.0 ++ bi = 2 ++ br = 2.0 ++ ci = 3 ++ cr = 3.0 ++ ++ if (ai .ne. 1) stop 1 ++ if (abs(ar - 1.0) > 1.0D-6) stop 2 ++ if (bi .ne. 2) stop 3 ++ if (abs(br - 2.0) > 1.0D-6) stop 4 ++ if (ci .ne. 3) stop 5 ++ if (abs(cr - 3.0) > 1.0D-6) stop 6 ++ if (kind(ai) .ne. 1) stop 7 ++ if (kind(ar) .ne. 4) stop 8 ++ if (kind(bi) .ne. 4) stop 9 ++ if (kind(br) .ne. 8) stop 10 ++ if (kind(ci) .ne. 8) stop 11 ++ if (kind(cr) .ne. 4) stop 12 ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f +new file mode 100644 +index 00000000000..bfaba584dbb +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f +@@ -0,0 +1,31 @@ ++! { dg-do run } ++! { dg-options "-fdec-override-kind" } ++! ++! Test kind specification in variable not in type ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer*8 ai*1, bi*4, ci ++ real*4 ar*4, br*8, cr ++ ++ ai = 1 ++ ar = 1.0 ++ bi = 2 ++ br = 2.0 ++ ci = 3 ++ cr = 3.0 ++ ++ if (ai .ne. 1) stop 1 ++ if (abs(ar - 1.0) > 1.0D-6) stop 2 ++ if (bi .ne. 2) stop 3 ++ if (abs(br - 2.0) > 1.0D-6) stop 4 ++ if (ci .ne. 3) stop 5 ++ if (abs(cr - 3.0) > 1.0D-6) stop 6 ++ if (kind(ai) .ne. 1) stop 7 ++ if (kind(ar) .ne. 4) stop 8 ++ if (kind(bi) .ne. 4) stop 9 ++ if (kind(br) .ne. 8) stop 10 ++ if (kind(ci) .ne. 8) stop 11 ++ if (kind(cr) .ne. 4) stop 12 ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f +new file mode 100644 +index 00000000000..5ff434e7466 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f +@@ -0,0 +1,31 @@ ++! { dg-do compile } ++! { dg-options "-fdec -fno-dec-override-kind" } ++! ++! Test kind specification in variable not in type ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer*8 ai*1, bi*4, ci ! { dg-error "Syntax error" } ++ real*4 ar*4, br*8, cr ! { dg-error "Syntax error" } ++ ++ ai = 1 ++ ar = 1.0 ++ bi = 2 ++ br = 2.0 ++ ci = 3 ++ cr = 3.0 ++ ++ if (ai .ne. 1) stop 1 ++ if (abs(ar - 1.0) > 1.0D-6) stop 2 ++ if (bi .ne. 2) stop 3 ++ if (abs(br - 2.0) > 1.0D-6) stop 4 ++ if (ci .ne. 3) stop 5 ++ if (abs(cr - 3.0) > 1.0D-6) stop 6 ++ if (kind(ai) .ne. 1) stop 7 ++ if (kind(ar) .ne. 4) stop 8 ++ if (kind(bi) .ne. 4) stop 9 ++ if (kind(br) .ne. 8) stop 10 ++ if (kind(ci) .ne. 8) stop 11 ++ if (kind(cr) .ne. 4) stop 12 ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f +new file mode 100644 +index 00000000000..c01980e8b9d +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f +@@ -0,0 +1,14 @@ ++! { dg-do compile } ++! ++! Test kind specification in variable not in type. The per variable ++! kind specification is not enabled so these should fail ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer a ++ parameter(a=2) ++ integer b*(a) ! { dg-error "Syntax error" } ++ real c*(8) ! { dg-error "Syntax error" } ++ logical d*1_1 ! { dg-error "Syntax error" } ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f +new file mode 100644 +index 00000000000..e2f39da3f4f +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f +@@ -0,0 +1,19 @@ ++! { dg-do run } ++! { dg-options "-fdec-override-kind" } ++! ++! Test kind specification in variable not in type ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer a ++ parameter(a=2) ++ integer b*(a) ++ real c*(8) ++ logical d*(1_1) ++ character e*(a) ++ if (kind(b).ne.2) stop 1 ++ if (kind(c).ne.8) stop 2 ++ if (kind(d).ne.1) stop 3 ++ if (len(e).ne.2) stop 4 ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f +new file mode 100644 +index 00000000000..569747874e3 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f +@@ -0,0 +1,19 @@ ++! { dg-do run } ++! { dg-options "-fdec" } ++! ++! Test kind specification in variable not in type ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer a ++ parameter(a=2) ++ integer b*(a) ++ real c*(8) ++ logical d*(1_1) ++ character e*(a) ++ if (kind(b).ne.2) stop 1 ++ if (kind(c).ne.8) stop 2 ++ if (kind(d).ne.1) stop 3 ++ if (len(e).ne.2) stop 4 ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f +new file mode 100644 +index 00000000000..b975bfd15c5 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f +@@ -0,0 +1,15 @@ ++! { dg-do compile } ++! { dg-options "-fdec -fno-dec-override-kind" } ++! ++! Test kind specification in variable not in type as the per variable ++! kind specification is not enables these should fail ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer a ++ parameter(a=2) ++ integer b*(a) ! { dg-error "Syntax error" } ++ real c*(8) ! { dg-error "Syntax error" } ++ logical d*1_1 ! { dg-error "Syntax error" } ++ end +diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f +new file mode 100644 +index 00000000000..85732e0bd85 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f +@@ -0,0 +1,14 @@ ++! { dg-do compile } ++! { dg-options "-fdec" } ++! ++! Check that invalid kind values are rejected. ++! ++! Contributed by Mark Eggleston ++! ++ program spec_in_var ++ integer a ++ parameter(a=3) ++ integer b*(a) ! { dg-error "Kind 3 not supported" } ++ real c*(78) ! { dg-error "Kind 78 not supported" } ++ logical d*(*) ! { dg-error "Invalid character" } ++ end +-- +2.27.0 + diff --git a/gcc12-fortran-flogical-as-integer.patch b/gcc12-fortran-flogical-as-integer.patch new file mode 100644 index 0000000..28df5e1 --- /dev/null +++ b/gcc12-fortran-flogical-as-integer.patch @@ -0,0 +1,305 @@ +From 9b45f3063dfd2b893e7963a4828c1b0afecdc68a Mon Sep 17 00:00:00 2001 +From: Mark Eggleston +Date: Fri, 22 Jan 2021 12:41:46 +0000 +Subject: [PATCH 02/10] Convert LOGICAL to INTEGER for arithmetic ops, and vice + versa + +We allow converting LOGICAL types to INTEGER when doing arithmetic +operations, and converting INTEGER types to LOGICAL for use in +boolean operations. + +This feature is enabled with the -flogical-as-integer flag. + +Note: using this feature will disable bitwise logical operations enabled by +-fdec. +--- + gcc/fortran/lang.opt | 4 ++ + gcc/fortran/resolve.cc | 55 ++++++++++++++++++- + .../logical_to_integer_and_vice_versa_1.f | 31 +++++++++++ + .../logical_to_integer_and_vice_versa_2.f | 31 +++++++++++ + .../logical_to_integer_and_vice_versa_3.f | 33 +++++++++++ + .../logical_to_integer_and_vice_versa_4.f | 33 +++++++++++ + 6 files changed, 186 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f + create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f + create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f + create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f + +diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt +index 52bd522051e..c4da248f07c 100644 +--- a/gcc/fortran/lang.opt ++++ b/gcc/fortran/lang.opt +@@ -497,6 +497,10 @@ fdec-static + Fortran Var(flag_dec_static) + Enable DEC-style STATIC and AUTOMATIC attributes. + ++flogical-as-integer ++Fortran Var(flag_logical_as_integer) ++Convert from integer to logical or logical to integer for arithmetic operations. ++ + fdefault-double-8 + Fortran Var(flag_default_double) + Set the default double precision kind to an 8 byte wide type. +diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc +index c075d0fa0c4..4b90cb59902 100644 +--- a/gcc/fortran/resolve.cc ++++ b/gcc/fortran/resolve.cc +@@ -3915,7 +3915,6 @@ lookup_uop_fuzzy (const char *op, gfc_symtree *uop) + return gfc_closest_fuzzy_match (op, candidates); + } + +- + /* Callback finding an impure function as an operand to an .and. or + .or. expression. Remember the last function warned about to + avoid double warnings when recursing. */ +@@ -3975,6 +3974,22 @@ convert_hollerith_to_character (gfc_expr *e) + } + } + ++/* If E is a logical, convert it to an integer and issue a warning ++ for the conversion. */ ++ ++static void ++convert_integer_to_logical (gfc_expr *e) ++{ ++ if (e->ts.type == BT_INTEGER) ++ { ++ /* Convert to LOGICAL */ ++ gfc_typespec t; ++ t.type = BT_LOGICAL; ++ t.kind = 1; ++ gfc_convert_type_warn (e, &t, 2, 1); ++ } ++} ++ + /* Convert to numeric and issue a warning for the conversion. */ + + static void +@@ -3987,6 +4002,22 @@ convert_to_numeric (gfc_expr *a, gfc_expr *b) + gfc_convert_type_warn (a, &t, 2, 1); + } + ++/* If E is a logical, convert it to an integer and issue a warning ++ for the conversion. */ ++ ++static void ++convert_logical_to_integer (gfc_expr *e) ++{ ++ if (e->ts.type == BT_LOGICAL) ++ { ++ /* Convert to INTEGER */ ++ gfc_typespec t; ++ t.type = BT_INTEGER; ++ t.kind = 1; ++ gfc_convert_type_warn (e, &t, 2, 1); ++ } ++} ++ + /* Resolve an operator expression node. This can involve replacing the + operation with a user defined function call. */ + +@@ -4072,6 +4103,12 @@ resolve_operator (gfc_expr *e) + case INTRINSIC_TIMES: + case INTRINSIC_DIVIDE: + case INTRINSIC_POWER: ++ if (flag_logical_as_integer) ++ { ++ convert_logical_to_integer (op1); ++ convert_logical_to_integer (op2); ++ } ++ + if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts)) + { + gfc_type_convert_binary (e, 1); +@@ -4108,6 +4145,13 @@ resolve_operator (gfc_expr *e) + case INTRINSIC_OR: + case INTRINSIC_EQV: + case INTRINSIC_NEQV: ++ ++ if (flag_logical_as_integer) ++ { ++ convert_integer_to_logical (op1); ++ convert_integer_to_logical (op2); ++ } ++ + if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL) + { + e->ts.type = BT_LOGICAL; +@@ -4158,6 +4202,9 @@ resolve_operator (gfc_expr *e) + goto simplify_op; + } + ++ if (flag_logical_as_integer) ++ convert_integer_to_logical (op1); ++ + if (op1->ts.type == BT_LOGICAL) + { + e->ts.type = BT_LOGICAL; +@@ -4198,6 +4245,12 @@ resolve_operator (gfc_expr *e) + convert_hollerith_to_character (op2); + } + ++ if (flag_logical_as_integer) ++ { ++ convert_logical_to_integer (op1); ++ convert_logical_to_integer (op2); ++ } ++ + if (op1->ts.type == BT_CHARACTER && op2->ts.type == BT_CHARACTER + && op1->ts.kind == op2->ts.kind) + { +diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f +new file mode 100644 +index 00000000000..938a91d9e9a +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f +@@ -0,0 +1,31 @@ ++! { dg-do run } ++! { dg-options "-std=legacy -flogical-as-integer" } ++! ++! Test conversion between logical and integer for logical operators ++! ++! Test case contributed by Jim MacArthur ++! Modified for -flogical-as-integer by Mark Eggleston ++! ++! ++ PROGRAM logical_integer_conversion ++ LOGICAL lpos /.true./ ++ INTEGER ineg/0/ ++ INTEGER ires ++ LOGICAL lres ++ ++ ! Test Logicals converted to Integers ++ if ((lpos.AND.ineg).EQ.1) STOP 3 ++ if ((ineg.AND.lpos).NE.0) STOP 4 ++ ires = (.true..AND.0) ++ if (ires.NE.0) STOP 5 ++ ires = (1.AND..false.) ++ if (ires.EQ.1) STOP 6 ++ ++ ! Test Integers converted to Logicals ++ if (lpos.EQ.ineg) STOP 7 ++ if (ineg.EQ.lpos) STOP 8 ++ lres = (.true..EQ.0) ++ if (lres) STOP 9 ++ lres = (1.EQ..false.) ++ if (lres) STOP 10 ++ END +diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f +new file mode 100644 +index 00000000000..9f146202ba5 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f +@@ -0,0 +1,31 @@ ++! { dg-do compile } ++! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" } ++! ++! Based on logical_to_integer_and_vice_versa_1.f but with option disabled ++! to test for error messages. ++! ++! Test case contributed by by Mark Eggleston ++! ++! ++ PROGRAM logical_integer_conversion ++ LOGICAL lpos /.true./ ++ INTEGER ineg/0/ ++ INTEGER ires ++ LOGICAL lres ++ ++ ! Test Logicals converted to Integers ++ if ((lpos.AND.ineg).EQ.1) STOP 3 ! { dg-error "Operands of logical operator" } ++ if ((ineg.AND.lpos).NE.0) STOP 4 ! { dg-error "Operands of logical operator" } ++ ires = (.true..AND.0) ! { dg-error "Operands of logical operator" } ++ if (ires.NE.0) STOP 5 ++ ires = (1.AND..false.) ! { dg-error "Operands of logical operator" } ++ if (ires.EQ.1) STOP 6 ++ ++ ! Test Integers converted to Logicals ++ if (lpos.EQ.ineg) STOP 7 ! { dg-error "Operands of comparison operator" } ++ if (ineg.EQ.lpos) STOP 8 ! { dg-error "Operands of comparison operator" } ++ lres = (.true..EQ.0) ! { dg-error "Operands of comparison operator" } ++ if (lres) STOP 9 ++ lres = (1.EQ..false.) ! { dg-error "Operands of comparison operator" } ++ if (lres) STOP 10 ++ END +diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f +new file mode 100644 +index 00000000000..446873eb2dc +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f +@@ -0,0 +1,33 @@ ++! { dg-do compile } ++! { dg-options "-std=legacy -flogical-as-integer" } ++! ++! Test conversion between logical and integer for logical operators ++! ++ program test ++ logical f /.false./ ++ logical t /.true./ ++ real x ++ ++ x = 7.7 ++ x = x + t*3.0 ++ if (abs(x - 10.7).gt.0.00001) stop 1 ++ x = x + .false.*5.0 ++ if (abs(x - 10.7).gt.0.00001) stop 2 ++ x = x - .true.*5.0 ++ if (abs(x - 5.7).gt.0.00001) stop 3 ++ x = x + t ++ if (abs(x - 6.7).gt.0.00001) stop 4 ++ x = x + f ++ if (abs(x - 6.7).gt.0.00001) stop 5 ++ x = x - t ++ if (abs(x - 5.7).gt.0.00001) stop 6 ++ x = x - f ++ if (abs(x - 5.7).gt.0.00001) stop 7 ++ x = x**.true. ++ if (abs(x - 5.7).gt.0.00001) stop 8 ++ x = x**.false. ++ if (abs(x - 1.0).gt.0.00001) stop 9 ++ x = x/t ++ if (abs(x - 1.0).gt.0.00001) stop 10 ++ if ((x/.false.).le.huge(x)) stop 11 ++ end +diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f +new file mode 100644 +index 00000000000..4301a4988d8 +--- /dev/null ++++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f +@@ -0,0 +1,33 @@ ++! { dg-do compile } ++! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" } ++! ++! Test conversion between logical and integer for logical operators ++! ++ program test ++ logical f /.false./ ++ logical t /.true./ ++ real x ++ ++ x = 7.7 ++ x = x + t*3.0 ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 10.7).gt.0.00001) stop 1 ++ x = x + .false.*5.0 ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 10.7).gt.0.00001) stop 2 ++ x = x - .true.*5.0 ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 5.7).gt.0.00001) stop 3 ++ x = x + t ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 6.7).gt.0.00001) stop 4 ++ x = x + f ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 6.7).gt.0.00001) stop 5 ++ x = x - t ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 5.7).gt.0.00001) stop 6 ++ x = x - f ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 5.7).gt.0.00001) stop 7 ++ x = x**.true. ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 5.7).gt.0.00001) stop 8 ++ x = x**.false. ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 1.0).gt.0.00001) stop 9 ++ x = x/t ! { dg-error "Operands of binary numeric" } ++ if (abs(x - 1.0).gt.0.00001) stop 10 ++ if ((x/.false.).le.huge(x)) stop 11 ! { dg-error "Operands of binary numeric" } ++ end +-- +2.27.0 + diff --git a/gcc16-hack.patch b/gcc12-hack.patch similarity index 56% rename from gcc16-hack.patch rename to gcc12-hack.patch index 61331bf..e98649e 100644 --- a/gcc16-hack.patch +++ b/gcc12-hack.patch @@ -64,119 +64,63 @@ + infodir="$(infodir)" \ GOCFLAGS="$(GOCFLAGS) $${flags}" \ GDCFLAGS="$(GDCFLAGS) $${flags}" \ - A68FLAGS="$(A68FLAGS) $${flags}" \ + CXXFLAGS="$(CXXFLAGS) $${flags}" \ --- libcpp/macro.cc.jj 2019-01-09 13:01:21.420552123 +0100 -+++ libcpp/macro.cc 2024-11-30 13:16:41.163056391 +0100 -@@ -3680,8 +3680,6 @@ static cpp_macro * ++++ libcpp/macro.cc 2019-01-11 18:18:17.736876285 +0100 +@@ -3256,8 +3256,6 @@ static cpp_macro * create_iso_definition (cpp_reader *pfile) { bool following_paste_op = false; - const char *paste_op_error_msg = -- N_("%<##%> cannot appear at either end of a macro expansion"); +- N_("'##' cannot appear at either end of a macro expansion"); unsigned int num_extra_tokens = 0; unsigned nparms = 0; cpp_hashnode **params = NULL; -@@ -3809,7 +3807,9 @@ create_iso_definition (cpp_reader *pfile +@@ -3382,7 +3380,9 @@ create_iso_definition (cpp_reader *pfile function-like macros, but not at the end. */ if (following_paste_op) { - cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg); + cpp_error (pfile, CPP_DL_ERROR, -+ "%<##%> cannot appear at either end of a macro " ++ "'##' cannot appear at either end of a macro " + "expansion"); goto out; } if (!vaopt_tracker.completed ()) -@@ -3824,7 +3824,9 @@ create_iso_definition (cpp_reader *pfile +@@ -3397,7 +3397,9 @@ create_iso_definition (cpp_reader *pfile function-like macros, but not at the beginning. */ if (macro->count == 1) { - cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg); + cpp_error (pfile, CPP_DL_ERROR, -+ "%<##%> cannot appear at either end of a macro " ++ "'##' cannot appear at either end of a macro " + "expansion"); goto out; } --- libcpp/expr.cc.jj 2019-01-09 13:01:22.415535734 +0100 -+++ libcpp/expr.cc 2024-11-30 13:14:52.468583689 +0100 -@@ -874,50 +874,54 @@ cpp_classify_number (cpp_reader *pfile, ++++ libcpp/expr.cc 2019-01-11 18:16:23.444726882 +0100 +@@ -803,16 +803,17 @@ cpp_classify_number (cpp_reader *pfile, if ((result & CPP_N_WIDTH) == CPP_N_LARGE && CPP_OPTION (pfile, cpp_warn_long_long)) { -- const char *message = CPP_OPTION (pfile, cplusplus) +- const char *message = CPP_OPTION (pfile, cplusplus) - ? N_("use of C++11 long long integer constant") - : N_("use of C99 long long integer constant"); - if (CPP_OPTION (pfile, c99)) -- cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location, + cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location, - 0, message); -+ cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location, 0, -+ CPP_OPTION (pfile, cplusplus) -+ ? N_("use of C++11 long long integer " -+ "constant") -+ : N_("use of C99 long long integer " -+ "constant")); ++ 0, CPP_OPTION (pfile, cplusplus) ++ ? N_("use of C++11 long long integer constant") ++ : N_("use of C99 long long integer constant")); else cpp_pedwarning_with_line (pfile, CPP_W_LONG_LONG, - virtual_location, 0, message); + virtual_location, 0, + CPP_OPTION (pfile, cplusplus) -+ ? N_("use of C++11 long long integer " -+ "constant") -+ : N_("use of C99 long long integer " -+ "constant")); ++ ? N_("use of C++11 long long integer constant") ++ : N_("use of C99 long long integer constant")); } if ((result & CPP_N_SIZE_T) == CPP_N_SIZE_T - && !CPP_OPTION (pfile, size_t_literals)) -- { -- const char *message -- = (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED -- ? N_("use of C++23 % integer constant") -- : N_("use of C++23 %%> integer constant"); -- cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS, -- virtual_location, 0, message); -- } -+ cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS, -+ virtual_location, 0, -+ (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED -+ ? N_("use of C++23 % integer " -+ "constant") -+ : N_("use of C++23 %%> " -+ "integer constant")); - - if ((result & CPP_N_BITINT) != 0 - && CPP_OPTION (pfile, cpp_warn_c11_c23_compat) != 0) - { - if (CPP_OPTION (pfile, cpp_warn_c11_c23_compat) > 0) - { -- const char *message = N_("ISO C does not support literal " -- "% suffixes before C23"); - if (CPP_PEDANTIC (pfile) && !CPP_OPTION (pfile, true_false)) - cpp_pedwarning_with_line (pfile, CPP_W_C11_C23_COMPAT, -- virtual_location, 0, message); -+ virtual_location, 0, -+ "ISO C does not support literal " -+ "% suffixes before C23"); - else - cpp_warning_with_line (pfile, CPP_W_C11_C23_COMPAT, -- virtual_location, 0, message); -- } -- else if (!CPP_OPTION (pfile, true_false)) -- { -- const char *message = N_("ISO C does not support literal " -+ virtual_location, 0, -+ "ISO C does not support literal " - "% suffixes before C23"); -- cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC, -- virtual_location, 0, message); - } -+ else if (!CPP_OPTION (pfile, true_false)) -+ cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC, -+ virtual_location, 0, -+ "ISO C does not support literal " -+ "% suffixes before C23"); - } - - result |= CPP_N_INTEGER; diff --git a/gcc16-isl-dl.patch b/gcc12-isl-dl.patch similarity index 98% rename from gcc16-isl-dl.patch rename to gcc12-isl-dl.patch index dc0c49b..824288b 100644 --- a/gcc16-isl-dl.patch +++ b/gcc12-isl-dl.patch @@ -629,7 +629,7 @@ --- gcc/graphite.cc.jj 2015-11-04 14:15:32.000000000 +0100 +++ gcc/graphite.cc 2015-11-04 14:56:02.645536409 +0100 @@ -60,6 +60,35 @@ along with GCC; see the file COPYING3. - #include "tree-ssa-propagate.h" + #include "tree-into-ssa.h" #include "graphite.h" +__typeof (isl_pointers__) isl_pointers__; @@ -664,7 +664,7 @@ /* Print global statistics to FILE. */ static void -@@ -424,6 +453,15 @@ graphite_transform_loops (void) +@@ -365,6 +394,15 @@ graphite_transform_loops (void) if (parallelized_function_p (cfun->decl)) return; @@ -680,7 +680,7 @@ calculate_dominance_info (CDI_DOMINATORS); /* We rely on post-dominators during merging of SESE regions so those -@@ -519,6 +557,14 @@ graphite_transform_loops (void) +@@ -455,6 +493,14 @@ graphite_transform_loops (void) } } @@ -696,16 +696,16 @@ static void --- gcc/toplev.cc.jj 2017-02-19 13:02:31.000000000 +0100 -+++ gcc/toplev.cc 2024-11-30 13:22:34.175096117 +0100 -@@ -100,6 +100,7 @@ along with GCC; see the file COPYING3. ++++ gcc/toplev.cc 2017-02-19 16:50:25.536301350 +0100 +@@ -94,6 +94,7 @@ along with GCC; see the file COPYING3. #ifdef HAVE_isl #include +extern const char *get_isl_version (bool); #endif - static void general_init (const char *, bool, unique_argv original_argv); -@@ -652,7 +653,7 @@ print_version (FILE *file, const char *i + static void general_init (const char *, bool); +@@ -683,7 +684,7 @@ print_version (FILE *file, const char *i #ifndef HAVE_isl "none" #else diff --git a/gcc16-isl-dl2.patch b/gcc12-isl-dl2.patch similarity index 89% rename from gcc16-isl-dl2.patch rename to gcc12-isl-dl2.patch index 8d2c4d9..2e12499 100644 --- a/gcc16-isl-dl2.patch +++ b/gcc12-isl-dl2.patch @@ -6,8 +6,8 @@ directory. --- gcc/toplev.cc.jj 2008-12-09 23:59:10.000000000 +0100 -+++ gcc/toplev.cc 2024-11-30 13:26:05.085132543 +0100 -@@ -112,6 +112,8 @@ static void finalize (); ++++ gcc/toplev.cc 2009-01-27 14:33:52.000000000 +0100 +@@ -113,6 +113,8 @@ static void finalize (bool); static void crash_signal (int) ATTRIBUTE_NORETURN; static void compile_file (void); @@ -16,14 +16,14 @@ /* Decoded options, and number of such options. */ struct cl_decoded_option *save_decoded_options; unsigned int save_decoded_options_count; -@@ -2296,6 +2298,8 @@ toplev::main (int argc, char **argv) +@@ -2239,6 +2241,8 @@ toplev::main (int argc, char **argv) expandargv (&argc, &argv); + toplev_main_argv = CONST_CAST2 (const char **, char **, argv); + /* Initialization of GCC's environment, and diagnostics. */ - general_init (argv[0], m_init_signals, std::move (original_argv)); + general_init (argv[0], m_init_signals); --- gcc/graphite.cc.jj 2010-12-01 10:24:32.000000000 -0500 +++ gcc/graphite.cc 2010-12-01 11:46:07.832118193 -0500 diff --git a/gcc16-libgomp-omp_h-multilib.patch b/gcc12-libgomp-omp_h-multilib.patch similarity index 100% rename from gcc16-libgomp-omp_h-multilib.patch rename to gcc12-libgomp-omp_h-multilib.patch diff --git a/gcc16-libstdc++-docs.patch b/gcc12-libstdc++-docs.patch similarity index 74% rename from gcc16-libstdc++-docs.patch rename to gcc12-libstdc++-docs.patch index 7d2d357..5781c12 100644 --- a/gcc16-libstdc++-docs.patch +++ b/gcc12-libstdc++-docs.patch @@ -4,21 +4,21 @@ FSF

-+ Release 16.0.1 ++ Release 12.3.1 +

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the --- libstdc++-v3/doc/html/api.html.jj 2011-01-03 12:53:21.000000000 +0100 -+++ libstdc++-v3/doc/html/api.html 2024-11-30 13:30:16.607594623 +0100 ++++ libstdc++-v3/doc/html/api.html 2011-01-04 18:12:01.672757784 +0100 @@ -20,7 +20,9 @@ member functions for the library classes, finding out what is in a particular include file, looking at inheritance diagrams, etc.

- The API documentation, rendered into HTML, can be viewed online + The API documentation, rendered into HTML, can be viewed locally -+ for the 16.0.1 release, ++ for the 12.3.1 release, + online - for each GCC release + for each GCC release and - + diff --git a/gcc16-libtool-no-rpath.patch b/gcc12-libtool-no-rpath.patch similarity index 87% rename from gcc16-libtool-no-rpath.patch rename to gcc12-libtool-no-rpath.patch index 8429a4c..466c661 100644 --- a/gcc16-libtool-no-rpath.patch +++ b/gcc12-libtool-no-rpath.patch @@ -5,7 +5,7 @@ libtool sucks. rpath="$finalize_rpath" test "$mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac ++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then @@ -13,7 +13,7 @@ libtool sucks. rpath= hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac ++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then @@ -21,7 +21,7 @@ libtool sucks. rpath= hardcode_libdirs= for libdir in $finalize_rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac ++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then diff --git a/gcc16-no-add-needed.patch b/gcc12-no-add-needed.patch similarity index 96% rename from gcc16-no-add-needed.patch rename to gcc12-no-add-needed.patch index 74f5c1f..5817299 100644 --- a/gcc16-no-add-needed.patch +++ b/gcc12-no-add-needed.patch @@ -34,4 +34,4 @@ +#define LINK_EH_SPEC "--no-add-needed %{!static|static-pie:--eh-frame-hdr} " #endif - + #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \ diff --git a/gcc12-rh1574936.patch b/gcc12-rh1574936.patch new file mode 100644 index 0000000..6b4be0c --- /dev/null +++ b/gcc12-rh1574936.patch @@ -0,0 +1,30 @@ +crt files and statically linked libgcc objects cause false positives +in annobin coverage, so we add the assembler flag to generate notes +for them. + +The patch also adds notes to libgcc_s.so, but this is harmless because +these notes only confer that there is no other annobin markup. + +2018-07-25 Florian Weimer + + * Makefile.in (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add + -Wa,--generate-missing-build-notes=yes. + +--- libgcc/Makefile.in 2018-01-13 13:05:41.000000000 +0100 ++++ libgcc/Makefile.in 2018-07-25 13:15:02.036226940 +0200 +@@ -246,6 +246,7 @@ LIBGCC2_DEBUG_CFLAGS = -g + LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ + $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ + -fbuilding-libgcc -fno-stack-protector \ ++ -Wa,--generate-missing-build-notes=yes \ + $(INHIBIT_LIBC_CFLAGS) + + # Additional options to use when compiling libgcc2.a. +@@ -301,6 +302,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN + $(NO_PIE_CFLAGS) -finhibit-size-directive -fno-inline -fno-exceptions \ + -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \ + -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \ ++ -Wa,--generate-missing-build-notes=yes \ + $(INHIBIT_LIBC_CFLAGS) $(USE_TM_CLONE_REGISTRY) + + # Extra flags to use when compiling crt{begin,end}.o. diff --git a/gcc16-sparc-config-detection.patch b/gcc12-sparc-config-detection.patch similarity index 77% rename from gcc16-sparc-config-detection.patch rename to gcc12-sparc-config-detection.patch index bbe8ec3..bb06b35 100644 --- a/gcc16-sparc-config-detection.patch +++ b/gcc12-sparc-config-detection.patch @@ -1,21 +1,21 @@ --- gcc/config.gcc.jj 2008-04-24 15:42:46.000000000 -0500 +++ gcc/config.gcc 2008-04-24 15:44:51.000000000 -0500 -@@ -3330,7 +3330,7 @@ sparc-*-rtems*) - tm_file="${tm_file} elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h" +@@ -2790,7 +2790,7 @@ sparc-*-rtems*) + tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h" tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems" ;; -sparc-*-linux*) +sparc-*-linux* | sparcv9-*-linux*) - tm_file="${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h" + tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" case ${target} in -@@ -3384,7 +3384,7 @@ sparc64-*-rtems*) +@@ -2844,7 +2844,7 @@ sparc64-*-rtems*) extra_options="${extra_options}" tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64" ;; -sparc64-*-linux*) +sparc64*-*-linux*) - tm_file="sparc/biarch64.h ${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h" + tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64" --- libgcc/config.host.jj 2008-04-24 15:46:19.000000000 -0500 diff --git a/gcc16-pr119006.patch b/gcc16-pr119006.patch deleted file mode 100644 index dfbdaa9..0000000 --- a/gcc16-pr119006.patch +++ /dev/null @@ -1,76 +0,0 @@ -2025-02-27 Jakub Jelinek - - PR ipa/119006 - * ipa-icf-gimple.cc (func_checker::compare_operand): If t1 and t2 - are ADDR_EXPRs, call operand_equal_p on their operands rather than on - the ADDR_EXPRs themselves. Formatting fix. - - * g++.dg/opt/pr119006.C: New test. - ---- gcc/ipa-icf-gimple.cc.jj 2025-02-01 00:50:02.080774328 +0100 -+++ gcc/ipa-icf-gimple.cc 2025-02-27 14:35:19.931183246 +0100 -@@ -437,12 +437,23 @@ func_checker::compare_operand (tree t1, - ("compare_ao_refs failed (dependence clique difference)"); - gcc_unreachable (); - } -+ else if (TREE_CODE (t1) == ADDR_EXPR && TREE_CODE (t2) == ADDR_EXPR) -+ { -+ /* For ADDR_EXPR compare the operands of the ADDR_EXPR rather than -+ the ADDR_EXPRs themselves. operand_equal_p will compare the -+ operands with OEP_ADDRESS_OF and only care about the value -+ of the ADDR_EXPR, rather than e.g. types of MEM_REFs in there. -+ Some optimizations use such details though, see PR119006. */ -+ if (operand_equal_p (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0), -+ OEP_MATCH_SIDE_EFFECTS)) -+ return true; -+ return return_false_with_msg ("operand_equal_p failed"); -+ } - else - { - if (operand_equal_p (t1, t2, OEP_MATCH_SIDE_EFFECTS)) - return true; -- return return_false_with_msg -- ("operand_equal_p failed"); -+ return return_false_with_msg ("operand_equal_p failed"); - } - } - ---- gcc/testsuite/g++.dg/opt/pr119006.C.jj 2025-02-27 14:37:05.952707350 +0100 -+++ gcc/testsuite/g++.dg/opt/pr119006.C 2025-02-27 14:36:29.251218260 +0100 -@@ -0,0 +1,36 @@ -+// PR ipa/119006 -+// { dg-do run { target c++11 } } -+// { dg-options "-O2 -fwhole-program" } -+ -+struct A { -+ bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); } -+ char a[11]; -+}; -+ -+struct B { -+ bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); } -+ bool operator!= (const char *x) const { return !(*this == x); } -+ char a[128]; -+}; -+ -+[[gnu::noinline,gnu::used]] int -+foo (const A& lhs, const char* rhs) -+{ -+ return lhs == rhs; -+} -+ -+constexpr const char *t = "abcdefghijklmno"; -+ -+[[gnu::noinline,gnu::used]] void -+bar (B x) -+{ -+ if (x != t) __builtin_abort (); -+} -+ -+int -+main () -+{ -+ B b; -+ __builtin_strcpy (b.a, t); -+ bar (b); -+} diff --git a/gcc16-pr123273.patch b/gcc16-pr123273.patch deleted file mode 100644 index 987f6e0..0000000 --- a/gcc16-pr123273.patch +++ /dev/null @@ -1,54 +0,0 @@ -2026-01-06 Jakub Jelinek - - PR preprocessor/123273 - * lex.cc (cpp_directive_only_process): Only go to done_comment - for '/' if star is true and esc is false. When seeing '\\' with - esc set to true, clear esc as well as star instead of keeping esc - set. - - * c-c++-common/cpp/dir-only-10.c: New test. - * c-c++-common/cpp/dir-only-11.c: New test. - ---- libcpp/lex.cc.jj 2026-01-02 09:56:10.417332292 +0100 -+++ libcpp/lex.cc 2026-01-05 16:40:26.413766032 +0100 -@@ -5461,7 +5461,13 @@ cpp_directive_only_process (cpp_reader * - switch (c) - { - case '\\': -- esc = true; -+ if (esc) -+ { -+ star = false; -+ esc = false; -+ } -+ else -+ esc = true; - break; - - case '\r': -@@ -5492,7 +5498,7 @@ cpp_directive_only_process (cpp_reader * - break; - - case '/': -- if (star) -+ if (star && !esc) - goto done_comment; - /* FALLTHROUGH */ - ---- gcc/testsuite/c-c++-common/cpp/dir-only-10.c.jj 2026-01-05 17:04:26.144566116 +0100 -+++ gcc/testsuite/c-c++-common/cpp/dir-only-10.c 2026-01-05 17:05:02.226946201 +0100 -@@ -0,0 +1,5 @@ -+/* PR preprocessor/123273 */ -+/* { dg-do preprocess } */ -+/* { dg-options -fdirectives-only } */ -+ -+/* *\/""" */ ---- gcc/testsuite/c-c++-common/cpp/dir-only-11.c.jj 2026-01-05 17:05:18.498666647 +0100 -+++ gcc/testsuite/c-c++-common/cpp/dir-only-11.c 2026-01-05 17:06:17.574651691 +0100 -@@ -0,0 +1,6 @@ -+/* PR preprocessor/123273 */ -+/* { dg-do preprocess } */ -+/* { dg-options -fdirectives-only } */ -+ -+/* *\\ -+/""" */ diff --git a/gcc16-rh1574936.patch b/gcc16-rh1574936.patch deleted file mode 100644 index bcc7000..0000000 --- a/gcc16-rh1574936.patch +++ /dev/null @@ -1,21 +0,0 @@ -crt files and statically linked libgcc objects cause false positives -in annobin coverage, so we add the assembler flag to generate notes -for them. - -The patch also adds notes to libgcc_s.so, but this is harmless because -these notes only confer that there is no other annobin markup. - -2018-07-25 Florian Weimer - - * config/t-linux (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add - -Wa,--generate-missing-build-notes=yes. - ---- libgcc/config/t-linux 2022-12-15 19:25:20.581394950 +0100 -+++ libgcc/config/t-linux 2023-03-21 22:00:37.054478562 +0100 -@@ -1,3 +1,6 @@ - # Override t-slibgcc-elf-ver to export some libgcc symbols with - # the symbol versions that glibc used. - SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver -+ -+LIBGCC2_CFLAGS += -Wa,--generate-missing-build-notes=yes -+CRTSTUFF_CFLAGS += -Wa,--generate-missing-build-notes=yes diff --git a/isl-rh2155127.patch b/isl-rh2155127.patch deleted file mode 100644 index 092bddb..0000000 --- a/isl-rh2155127.patch +++ /dev/null @@ -1,85 +0,0 @@ -From: Sven Verdoolaege -Date: Mon, 6 Jun 2022 12:56:02 +0000 (+0200) -Subject: update m4/ax_prog_cc_for_build.m4 -X-Git-Tag: isl-0.25~11 -X-Git-Url: https://repo.or.cz/isl.git/commitdiff_plain/b4dcdfadc29a6c9f410a72f345f3f32725b1d38b - -update m4/ax_prog_cc_for_build.m4 - -In particular, update to the latest version from the autoconf archive, -but preserve the changes from isl-0.22.1-358-gcd42abdf2 -(m4/ax_prog_cc_for_build.m4: do not override host compiler dependency style, -Tue Jun 9 10:54:10 2020 +0200). - -Signed-off-by: Sven Verdoolaege - ---- isl-0.24/m4/ax_prog_cc_for_build.m4.jj 2021-03-02 12:07:09.000000000 +0100 -+++ isl-0.24/m4/ax_prog_cc_for_build.m4 2022-12-20 18:11:18.855777817 +0100 -@@ -32,7 +32,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 18 -+#serial 21 - - AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) - AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -@@ -44,6 +44,8 @@ dnl Use the standard macros, but make th - dnl - pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl - pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl -+pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl -+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl - pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl - pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl - pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -@@ -86,7 +88,21 @@ AS_IF([test -n "$build"], [ac_build - [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) - - AC_LANG_PUSH([C]) -+ -+dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover -+dnl the use of this variable in _AC_LANG_COMPILER_GNU called by -+dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround. -+was_set_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y} -+AS_IF([test ${was_set_c_compiler_gnu}], -+ [saved_c_compiler_gnu=$[ac_cv_c_compiler_gnu] -+ AS_UNSET([[ac_cv_c_compiler_gnu]])]) -+ - AC_PROG_CC -+ -+dnl Restore ac_cv_c_compiler_gnu -+AS_IF([test ${was_set_c_compiler_gnu}], -+ [[ac_cv_c_compiler_gnu]=$[saved_c_compiler_gnu]]) -+ - _AC_COMPILER_EXEEXT - _AC_COMPILER_OBJEXT - AC_PROG_CPP ---- isl-0.24/configure.jj 2021-04-26 11:13:19.000000000 +0200 -+++ isl-0.24/configure 2022-12-20 18:11:36.882518568 +0100 -@@ -5002,6 +4990,13 @@ ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR - ac_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_build_c_compiler_gnu - -+ -+was_set_c_compiler_gnu=${ac_cv_c_compiler_gnu+y} -+if test ${was_set_c_compiler_gnu}; then : -+ saved_c_compiler_gnu=$ac_cv_c_compiler_gnu -+ { ac_cv_c_compiler_gnu=; unset ac_cv_c_compiler_gnu;} -+fi -+ - ac_ext=c - ac_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' - ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -@@ -5728,6 +5723,11 @@ else - fi - - -+ -+if test ${was_set_c_compiler_gnu}; then : -+ ac_cv_c_compiler_gnu=$saved_c_compiler_gnu -+fi -+ - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - diff --git a/plans/ci.fmf b/plans/ci.fmf index b661134..b6a344d 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,7 +1,7 @@ summary: CI Gating Plan discover: how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/gcc.git + url: https://src.fedoraproject.org/tests/gcc.git filter: 'tag: Fedora-CI-gating' execute: how: tmt diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index f31bc02..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,37 +0,0 @@ -inspections: - # GCC subpackages are inter-dependent but without requesting an explicit - # version - which rpmdeps dislikes and creates huge reports. We can't fix - # it easily and it's not a practical problem anyway. Unfortunately we - # can't tell rpmdeps to ignore just that particular warning. Switching off - # the rpmdeps checks looks like a lesser evil. - rpmdeps: off - -badfuncs: - # GCC doesn't use the so called bad functions "much". If they appear then - # - it is instrumenting them in sanitizers - # - in languages that don't move further downstream. - # We are OK with that. - ignore: - - /usr/lib*/libasan.so.*.*.* - - /usr/lib*/libtsan.so.*.*.* - - /usr/lib*/libgnat-*.so - - /usr/lib*/libgphobos.so.*.*.* - - /usr/lib*/libm2iso.so.*.*.* - - /usr/lib*/libm2pim.so.*.*.* - -pathmigration: - # Incomplete UsrMove, known but not planned at the moment - ignore: - - /lib*/libgcc_s-*.so.* - - /lib*/libgcc_s.so.* - -debuginfo: - # Skip the Go binaries, they ship unstripped - ignore: - - /usr/bin/go.gcc - - /usr/bin/gofmt.gcc - - /usr/lib*/libgo.so.*.*.* - - /usr/libexec/gcc/*-redhat-linux/*/buildid - - /usr/libexec/gcc/*-redhat-linux/*/cgo - - /usr/libexec/gcc/*-redhat-linux/*/test2json - - /usr/libexec/gcc/*-redhat-linux/*/vet diff --git a/sources b/sources index f1dba4c..27ce190 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gcc-16.0.1-20260115.tar.xz) = 51ab079dedde5547caba601ce03954d4c5b2bf687538f106d3e851a8918162017fe65817d9e22fd115cf4d4f970bfba6a70a34db183141ce28c5c203a68eec0b +SHA512 (gcc-12.3.1-20230508.tar.xz) = 6e9458f85a081d5ab5bdb4acd988b7c1d877870069d853310e5d64fd678f1420ff6db8c096aeb1a4349de6881949040bcef70b670daa603fdd0e06a7a8e03829 SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 -SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881 -SHA512 (nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz) = 7f862986065028df70c843fc3f2c89e200a76b48ad0bd51c749ac8a5aab7be0ebdf35be182fad2407b3281615e75be1ac6833ab6a5130ae9920169a0412f94f0 +SHA512 (newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz) = b099246fe4a5d0a372cdaee5da49083df5b2f4440a4e83961600cdf22d37da50c99ce9ae46b769f188a67034ee038cf863260988fc9d594e8e5fb3905a381dec +SHA512 (nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz) = 91690321bf96460c3b3e229199a6f752ed1c27c6933d4345dc7e237dc068f604ad211bb3a0373e14d4f332bee05b6227d6933e14e0b475ffdfea8b511ab735e6 diff --git a/update-gcc.sh b/update-gcc.sh index 47d7d70..9a73b78 100755 --- a/update-gcc.sh +++ b/update-gcc.sh @@ -1,36 +1,7 @@ #!/bin/sh -if [ "$#" -eq 0 ]; then - echo "Usage: ./update-gcc.sh gcc/redhat/heads/gcc-NN-branch_commit_hash [git_reference_dir_to_speed_up]" - exit 1 -fi -export LC_ALL=C -if ! [ -f gcc.spec ]; then echo Must be run in the directory with gcc.spec file.; exit 1; fi -if [ -d gcc-dir.tmp ]; then echo gcc-dir.tmp already exists.; exit 1; fi -v=`sed -n 's/^%global gcc_version //p' gcc.spec` -p=`sed -n 's/^%global gitrev //p' gcc.spec` -h=$1 -if [ "$#" -ge 2 ]; then - git clone --dissociate --reference $2 https://gcc.gnu.org/git/gcc.git gcc-dir.tmp -else - git clone https://gcc.gnu.org/git/gcc.git gcc-dir.tmp -fi -git --git-dir=gcc-dir.tmp/.git fetch origin $h +[ -d gcc-dir.tmp ] && echo gcc-dir.tmp already exists && exit 1 +git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp +git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin $1 d=`date --iso | sed 's/-//g'` -cd gcc-dir.tmp -git diff $p..$h > P1 -git log --format=%B `git log --format='%ae %H' $p..$h | awk '/^gccadmin@gcc.gnu.org/{print $2;exit 0}'`..$h > P2 -diff -up /dev/null P2 >> P1 -sed -n 's,^+[[:blank:]]\+PR \([a-z0-9+-]\+/[0-9]\+\)$,\1,p' P1 | sed 's/ - .*$//;s/[: ;.]//g' | LC_ALL=C sort -u -t / -k 1,1 -k 2,2n > P3 -> P4 -for i in `cat P3`; do if grep -F $i ../gcc.spec >/dev/null; then echo $i already recorded.; else echo $i >> P4; fi; done -case "$v" in - *.0.*) echo "- update from trunk" > P5;; - *) echo "- update from releases/gcc-`echo $v | sed 's/\..*$//'` branch" > P5;; -esac -echo `cat P4` | sed 's/ /, /g' | fold -w 71 -s | sed '1s/^/ - PRs /;2,$s/^/ /;s/, $/,/' >> P5 -echo >> P5 -cd .. -sed -i -e '/^%global gitrev /s/ [0-9a-f]\+$/ '$h'/;/^%global DATE /s/ [0-9]\+$/ '$d'/;/^%changelog$/r gcc-dir.tmp/P5' gcc.spec -git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-$v-$d/ $h | xz -9e > gcc-$v-$d.tar.xz +git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-12.3.1-$d/ $1 | xz -9e > gcc-12.3.1-$d.tar.xz rm -rf gcc-dir.tmp -fedpkg new-sources gcc-$v-$d.tar.xz `sed 's/SHA512 (\(.*\)) = [0-9a-f]\+$/\1/' sources | grep -v '^gcc-'`