16.2.1-1.1

Don't ship libasan_preinit.o in the main package.

Resolves: RHEL-219125

.fmf/version

@@ -0,0 +1 @@
+1

.gcc-toolset-16-gcc.metadata

@@ -1,4 +0,0 @@
-ad3dd9ba3c07858b2b94260ce743fd790483b4f0 SOURCES/gcc-16.2.1-20260807.tar.xz
-ae5fbb33bcb442121fbbf482a93f6b3c84d489ee SOURCES/isl-0.24.tar.bz2
-a773e95eebbe32d537e03b2f080a3b5fdaf771b0 SOURCES/newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz
-930a1b079d47c966a1f55467a10dccaf5dce8281 SOURCES/nvptx-tools-212da2e781ed0f9423824e85eb04819958513f7a.tar.xz

.gitignore

@@ -1,4 +1,2 @@
-SOURCES/gcc-16.2.1-20260807.tar.xz
-SOURCES/isl-0.24.tar.bz2
-SOURCES/newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz
-SOURCES/nvptx-tools-212da2e781ed0f9423824e85eb04819958513f7a.tar.xz
+/gcc-16.1.1-20260703.tar.xz
+/gcc-16.2.1-20260807.tar.xz

0022-libstdc++-revert-behavior.patch

@@ -0,0 +1,72 @@
+diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12791.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12791.cc
+index fa740b42b88..5d808ee51ee 100644
+--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12791.cc
++++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12791.cc
+@@ -39,14 +39,14 @@ void test01()
+   const ios_base::iostate good = ios_base::goodbit;
+   ios_base::iostate errorstate = good;
+ 
+-  iss.str("62/04/71");
++  iss.str("60/04/71");
+   iterator_type is_it01(iss);
+   tm time01;
+   errorstate = good;
+   iterator_type ret01 = tim_get.get_date(is_it01, end, iss, errorstate,
+ 					 &time01);
+   VERIFY( errorstate == ios_base::failbit );
+-  VERIFY( *ret01 == '2' );
++  VERIFY( *ret01 == '6' );
+ 
+   iss.str("04/38/71");
+   iterator_type is_it02(iss);
+diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12791.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12791.cc
+index 07f4c369e58..c975c8523d8 100644
+--- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12791.cc
++++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12791.cc
+@@ -40,14 +40,14 @@ void test01()
+   const ios_base::iostate good = ios_base::goodbit;
+   ios_base::iostate errorstate = good;
+ 
+-  iss.str(L"62/04/71");
++  iss.str(L"60/04/71");
+   iterator_type is_it01(iss);
+   tm time01;
+   errorstate = good;
+   iterator_type ret01 = tim_get.get_date(is_it01, end, iss, errorstate,
+ 					 &time01);
+   VERIFY( errorstate == ios_base::failbit );
+-  VERIFY( *ret01 == L'2' );
++  VERIFY( *ret01 == L'6' );
+ 
+   iss.str(L"04/38/71");
+   iterator_type is_it02(iss);
+diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
+index e6f53de4a55..c9d9896a6c0 100644
+--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
++++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
+@@ -76,8 +76,8 @@ void test01()
+   errorstate = good;
+   iterator_type ret03 = tim_get.get_year(is_it03, end, iss, errorstate,
+ 					 &time03);
+-  VERIFY( time03.tm_year == 197 - 1900 );
+-  VERIFY( errorstate == good );
++  VERIFY( time03.tm_year == 3 );
++  VERIFY( errorstate == ios_base::failbit );
+   VERIFY( *ret03 == 'd' );
+ 
+   iss.str("71d71");
+diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
+index ba95fb91520..e17712098f4 100644
+--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
++++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
+@@ -76,8 +76,8 @@ void test01()
+   errorstate = good;
+   iterator_type ret03 = tim_get.get_year(is_it03, end, iss, errorstate,
+ 					 &time03);
+-  VERIFY( time03.tm_year == 197 - 1900 );
+-  VERIFY( errorstate == good );
++  VERIFY( time03.tm_year == 3 );
++  VERIFY( errorstate == ios_base::failbit );
+   VERIFY( *ret03 == L'd' );
+ 
+   iss.str(L"71d71");

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}

gcc-toolset-16-gcc.spec

@@ -186,7 +186,7 @@ BuildRequires: gcc-toolset-%{gts_ver}-devel
 Summary: GCC version %{gcc_major}
 Name: %{?scl_prefix}gcc
 Version: %{gcc_version}
-Release: %{gcc_release}%{?dist}
+Release: %{gcc_release}.1%{?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
@@ -311,6 +311,9 @@ BuildRequires: dblatex, texlive-collection-latex, docbook-style-xsl
 
 Requires: libgcc >= 4.1.2-43
 Requires: libgomp >= 4.4.4-13
+%if %{build_libatomic}
+Requires: %{?scl_prefix}libatomic-devel = %{version}-%{release}
+%endif
 # lto-wrapper invokes make
 Requires: make
 %if %have_scl_utils
@@ -954,16 +957,6 @@ ln -sf libisl.so.23 libisl.so
 cd ../..
 %endif
 
-# Disabled on Intel because of:
-# https://bugzilla.redhat.com/show_bug.cgi?id=2091571#c1
-%if 0%{?rhel} == 8
-%ifnarch %{ix86} x86_64
-%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
-%endif
-%else
-%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
-%endif
-
 offloadtgts=
 %if %{build_offload_nvptx}
 offloadtgts=nvptx-none
@@ -2154,7 +2147,7 @@ cp -a %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++_nonshared%{nonshar
 
 # run the tests.
 LC_ALL=C make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \
-     RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector-strong}'" || :
+     RUNTESTFLAGS="--target_board=unix/'{-foffload=disable,-fstack-protector-strong/-foffload=disable}'" || :
 ( LC_ALL=C ../contrib/test_summary -t || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}' > testresults
 rm -rf gcc/testsuite.prev
 mv gcc/testsuite{,.prev}
@@ -2672,7 +2665,7 @@ fi
 %endif
 %if %{build_libasan}
 %dnl %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o
+%dnl %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o
 %endif
 %endif
 %{_prefix}/libexec/getconf/default
@@ -3085,6 +3078,10 @@ fi
 %endif
 
 %changelog
+* Thu Aug 27 2026 Marek Polacek <polacek@redhat.com> 16.2.1-1.1
+- require gcc-toolset-libatomic-devel (RHEL-247735)
+- perform %%check with -foffload=disable flag (RHEL-247738)
+
 * Tue Aug 11 2026 Marek Polacek <polacek@redhat.com> 16.2.1-1
 - update from releases/gcc-16 branch (RHEL-220997)
   - GCC 16.2.0 release

plans/tier0.fmf

@@ -0,0 +1,39 @@
+# Tier 0 test plan. It's actually Tier 1
+#   - limited to its public part
+#   - executed on the architecture at hand
+# When run by osci.tier0 on CentOS Stream or RHEL, it receives the following
+# context:
+#   arch=x86_64 (the architecture at hand, currently OSCI uses just x86_64)
+#   distro=rhel<M>.<m> (even for CentOS Stream builds)
+#   trigger=build
+---
+summary: Tier 0 test plan
+context:
+  collection: gcc-toolset-16
+environment+:
+  COLLECTIONS: gcc-toolset-16
+  WITH_SCL: "scl enable gcc-toolset-16"
+discover:
+  - name: collect_info
+    how: shell
+    tests:
+      - name: /info/rpms
+        test: rpm -qa --last
+  - name: public_tests
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/tests/gcc.git
+    filter: 'tag: CI-Tier-1'
+provision+:
+  hardware:
+    disk:
+      - size: ">= 60 GiB"
+    memory: ">= 8 GiB"
+prepare+:
+  - how: shell
+    script:
+      - dnf config-manager --set-enabled '*CRB*' || true
+      - dnf config-manager --set-enabled crb || true
+      - dnf config-manager --set-enabled rhel-buildroot || true
+      - dnf config-manager --set-enabled epel || true
+execute:
+  how: tmt

rpminspect.yaml

@@ -0,0 +1,23 @@
+badfuncs:
+    # GCC doesn't use the "forbidden" functions as such. Just some of its
+    # sanitizers can instrument those functions which leads to false
+    # positives in the badfuncs test.
+    ignore:
+      - /usr/lib*/libasan.so.*.*.*
+      - /usr/lib*/libtsan.so.*.*.*
+
+specname:
+    # In GCC toolsets builds, the spec file name and the package may not
+    # be exactly the same, the package is prefixed with gcc-toolset-NN-.
+    # Let's ignore the prefix.
+    match: suffix
+    primary: filename
+
+runpath:
+    # Although gcc-toolset sanitizers link gcc-toolset libraries from
+    # /opt/..., they themselves are placed in /usr. The runpath test
+    # doesn't like this difference. Explicitly allow it.
+    allowed_paths:
+      - /opt/rh/gcc-toolset-16/root/usr/lib
+      - /opt/rh/gcc-toolset-16/root/usr/lib/../lib64
+      - /opt/rh/gcc-toolset-16/root/usr/lib64

sources

@@ -0,0 +1,4 @@
+SHA512 (gcc-16.2.1-20260807.tar.xz) = 5bb60a3172a7c2bfe8723e683b3621f8faabe97e1d5b4ef716e63e9a6e92e16870881661d14eb085af5d4bfe72f0a6b3f866479c9d7133957c0b15d78b35bd19
+SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
+SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881
+SHA512 (nvptx-tools-212da2e781ed0f9423824e85eb04819958513f7a.tar.xz) = 5a5509b0513843254ee2be277e0b8d4733f643b74b98c739e82872181a2c366b9b43de9e5fb505aa1e9967a382da59cab015f63011cbcb5972971f2160870f00