Import from CS git

.gcc-toolset-13-annobin.metadata

@@ -1 +1 @@
-c77f60d6064617958a3c35bcd930b33e5567ac78 SOURCES/annobin-12.32.tar.xz
+b0926901d5fc2e76b48a923cafc2fc06e59219c5 SOURCES/annobin-12.92.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/annobin-12.32.tar.xz
+SOURCES/annobin-12.92.tar.xz

SOURCES/annobin-gcc-plugin-cl-vars.patch

@@ -0,0 +1,29 @@
+--- annobin-12.92/gcc-plugin/annobin.cc	2025-02-14 10:40:14.000000000 +0000
++++ annobin.new/gcc-plugin/annobin.cc	2025-02-18 12:38:54.231135138 +0000
+@@ -909,7 +909,7 @@ const char *
+ annobin_get_str_option_by_name (const char * name ATTRIBUTE_UNUSED,
+ 				const char * default_return)
+ {
+-#if GCCPLUGIN_VERSION_MAJOR >= 11
++#if GCCPLUGIN_VERSION_MAJOR >= 14
+   /* GCC version 11 introduced the cl_vars array which provides offsets for
+      fields in global_options which are not handled by cl_options.  */
+   const struct cl_var * var = cl_vars;
+@@ -929,7 +929,7 @@ const int
+ annobin_get_int_option_by_name (const char * name ATTRIBUTE_UNUSED,
+ 				const int    default_return)
+ {
+-#if GCCPLUGIN_VERSION_MAJOR >= 11
++#if GCCPLUGIN_VERSION_MAJOR >= 14
+   /* GCC version 11 introduced the cl_vars array which provides offsets for
+      fields in global_options which are not handled by cl_options.  */
+   const struct cl_var * var = cl_vars;
+@@ -3249,7 +3249,7 @@ multiple_annobin_plugins_present (const
+       return false;
+     }
+ 
+-#if GCCPLUGIN_VERSION_MAJOR > 11
++#if GCCPLUGIN_VERSION_MAJOR > 14
+   /* We used to call plugins_active_p() here but this only lets us know if
+      there are other active plugins.  It does not tell us if they are
+      different versions of the annobin plugin.  So instead we iterate

SOURCES/annobin-nop.patch

@@ -0,0 +1,11 @@
+--- annobin.orig/gcc-plugin/annobin.cc	2023-04-28 09:58:05.487156290 +0100
++++ annobin-12.09/gcc-plugin/annobin.cc	2023-04-28 09:58:36.434248542 +0100
+@@ -2104,7 +2104,7 @@ annobin_emit_start_sym_and_version_note
+ 	     Ensure that we do not have empty special text sections so that the
+ 	     annobin start symbols are never beyond the end of the sections.  */
+ #ifndef ANNOBIN_NOP_INSN
+-#define ANNOBIN_NOP_INSN ".nop"
++#define ANNOBIN_NOP_INSN "nop"
+ #endif
+ 	  if (* suffix && enable_ppc64_nops)
+ 	    annobin_emit_asm (ANNOBIN_NOP_INSN,

SOURCES/annobin-tmp-default-to-using-group-attach.patch

@@ -1,6 +1,6 @@
---- annobin.orig/gcc-plugin/annobin.cc	2023-06-23 09:52:10.176119281 +0100
+--- annobin.orig/gcc-plugin/annobin.cc	2024-08-01 15:11:39.354764926 +0100
-+++ annobin-12.14/gcc-plugin/annobin.cc	2023-06-23 10:06:28.621554381 +0100
++++ annobin-12.65/gcc-plugin/annobin.cc	2024-08-01 15:12:52.266046180 +0100
-@@ -3155,7 +3155,7 @@ plugin_init (struct plugin_name_args *
+@@ -3311,7 +3311,7 @@ plugin_init (struct plugin_name_args *
  	     versions that are needed.  (Note - 2.35.2, as used by RHEL-9, is insufficient).
  	     See BZ 2016458 for an example of where this solution is needed.  */
  #if GCCPLUGIN_VERSION_MAJOR >= 12

SOURCES/annobin-tmp-skip-libannocheck-test.patch

@@ -1,12 +0,0 @@
-diff -rup annobin.orig/tests/libannocheck-test annobin-12.14/tests/libannocheck-test
---- annobin.orig/tests/libannocheck-test	2023-06-23 10:25:50.591952049 +0100
-+++ annobin-12.14/tests/libannocheck-test	2023-06-23 10:26:29.757972286 +0100
-@@ -16,6 +16,8 @@ TEST_NAME=libannocheck
- . $srcdir/common.sh
- 
- start_test
-+end_test
-+exit 0
- 
- LIBANNOCHECKDIR=${LIBANNOCHECKDIR:-../../annocheck/.libs}
- INCDIR=${INCDIR:-$srcdir/../annocheck}

SPECS/annobin.spec

@@ -8,8 +8,8 @@ BuildRequires: scl-utils-build
 
 Name:    %{?scl_prefix}annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.32
+Version: 12.92
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later
 URL: https://sourceware.org/annobin/
 # Maintainer: nickc@redhat.com
@@ -57,7 +57,7 @@ URL: https://sourceware.org/annobin/
 #
 # The default is to use plugin during rebuilds (cf BZ 1630550) but this can
 # be changed because of the need to be able to rebuild annobin when a change
-# to gcc breaks the version installed into the buildroot.  Mote however that
+# to gcc breaks the version installed into the buildroot.  Note however that
 # uncommenting the lines below will result in annocheck not passing the rpminspect
 # tests....
 %if %{without plugin_rebuild}
@@ -70,21 +70,23 @@ URL: https://sourceware.org/annobin/
 Source: https://nickc.fedorapeople.org/%{annobin_sources}
 # For the latest sources use:  git clone git://sourceware.org/git/annobin.git
 
-# Insert patches here, if needed.  Eg:
+# Insert patches here, if needed.
-# Patch01: annobin-foo.patch
+Patch01: annobin-nop.patch
-Patch01: annobin-tmp-default-to-using-group-attach.patch
+Patch02: annobin-tmp-default-to-using-group-attach.patch
-Patch02: annobin-tmp-skip-libannocheck-test.patch
+Patch03: annobin-gcc-plugin-cl-vars.patch
 
 # This is where a copy of the sources will be installed.
 %global annobin_source_dir %{?_scl_root}/%{_usrsrc}/annobin
 
-%{?scl:Requires:%scl_runtime}
+BuildRequires: %{?scl_prefix}gcc
+BuildRequires: %{?scl_prefix}gcc-c++
+BuildRequires: %{?scl_prefix}annobin-plugin-gcc
 %{?scl:BuildRequires:%scl_runtime}
-# We need the gcc-toolset-13 version of gcc to build annobin, as otherwise the versions will not match.
+
+%{?scl:Requires:%scl_runtime}
+# We need the gcc-toolset-N version of gcc in order to run annobin, as otherwise the versions will not match.
 %{?scl:Requires:%scl_require_package %{scl} gcc}
 
-BuildRequires: %{?scl_prefix}gcc
-BuildRequires: %{?scl_prefix}annobin-plugin-gcc
 %define gcc_for_annobin %{?_scl_root}/usr/bin/gcc
 %define gxx_for_annobin %{?_scl_root}/usr/bin/g++
 
@@ -332,7 +334,7 @@ fi
 echo "Requires: (%{?scl_prefix}gcc >= %{gcc_major} and %{?scl_prefix}gcc < %{gcc_next})"
 
 # NB/ Do not add {?scl_prefix} to the -n option below.  The annobin sources
-# unpack into a directory called annobin-VERSION not gcc-toolset-13-annobin-VERSION.
+# unpack into a directory called annobin-VERSION not gcc-toolset-N-annobin-VERSION.
 %autosetup -p1 -n annobin-%{version}
 
 # The plugin has to be configured with the same arcane configure
@@ -361,8 +363,8 @@ CONFIG_ARGS="$CONFIG_ARGS --with-debuginfod"
 CONFIG_ARGS="$CONFIG_ARGS --without-debuginfod"
 %endif
 
-%if %{with clangplugin}
+%if %{without clangplugin}
-CONFIG_ARGS="$CONFIG_ARGS --with-clang"
+CONFIG_ARGS="$CONFIG_ARGS --without-clang-plugin"
 %endif
 
 %if %{without gccplugin}
@@ -371,8 +373,8 @@ CONFIG_ARGS="$CONFIG_ARGS --without-gcc-plugin"
 CONFIG_ARGS="$CONFIG_ARGS --with-gcc-plugin-dir=%{ANNOBIN_GCC_PLUGIN_DIR}"
 %endif
 
-%if %{with llvmplugin}
+%if %{without llvmplugin}
-CONFIG_ARGS="$CONFIG_ARGS --with-llvm"
+CONFIG_ARGS="$CONFIG_ARGS --without-llvm-plugin"
 %endif
 
 %if %{without tests}
@@ -393,9 +395,8 @@ export CFLAGS="$CFLAGS -DAARCH64_BRANCH_PROTECTION_SUPPORTED=1"
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS %build_cflags -I%{?_scl_root}/usr/include"
 export LDFLAGS="$LDFLAGS %build_ldflags -L%{?_scl_root}/usr/lib64 -L%{?_scl_root}/usr/lib"
 
-# Set target-specific security options to be used when building the
+# Set target-specific options to be used when building the Clang and LLVM plugins.
-# Clang and LLVM plugins.  FIXME: There should be a better way to do
+# FIXME: There should be a better way to do this.
-# this.
 %ifarch %{ix86} x86_64
 export CLANG_TARGET_OPTIONS="-fcf-protection"
 %endif
@@ -406,9 +407,8 @@ export CLANG_TARGET_OPTIONS="-mbranch-protection=standard"
 %endif
 %endif
 
-%ifarch ppc ppc64 ppc64le
+%ifnarch riscv64
-# FIXME: This is a workaround for a problem with the Clang C++ headers.  It should not be needed.
+export CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS -flto -O2"
-export CLANG_TARGET_OPTIONS="-mabi=ibmlongdouble"
 %endif
 
 CC=%gcc_for_annobin CXX=%gxx_for_annobin CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CXXFLAGS="$CFLAGS" %configure ${CONFIG_ARGS} || cat config.log
@@ -443,12 +443,14 @@ rm %{_tmppath}/tmp_annobin.so
 
 %if %{with clangplugin}
 cp clang-plugin/annobin-for-clang.so %{_tmppath}/tmp_annobin.so
-make -C clang-plugin all CXXFLAGS="$OPTS $BUILD_FLAGS"
+# To enable verbose more in the plugin append the following: ANNOBIN="verbose"
+make -C clang-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS"
 %endif
 
 %if %{with llvmplugin}
 cp llvm-plugin/annobin-for-llvm.so %{_tmppath}/tmp_annobin.so
-make -C llvm-plugin all CXXFLAGS="$OPTS $BUILD_FLAGS"
+# To enable verbose more in the plugin append the following: ANNOBIN_VERBOSE="true"
+make -C llvm-plugin clean all CLANG_TARGET_OPTIONS="$CLANG_TARGET_OPTIONS $BUILD_FLAGS"
 %endif
 
 # endif for %%if {with_plugin_rebuild}
@@ -468,11 +470,20 @@ mv %{buildroot}/%{llvm_plugin_dir}/annobin-for-clang.so %{buildroot}/%{clang_plu
 %endif
 
 %if %{with gccplugin}
+pushd %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}
+
 # Record the version of gcc that built this plugin.
 # Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes
 # without the NVR being altered.  See BZ #2030671 for more discussion on this.
-mkdir -p                             %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}
+cat `%gcc_for_annobin --print-file-name=rpmver` > %{aver}
-cat `gcc --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver}
+
+# Also rename the plugin to its GTS variant
+mv annobin.so.0.0.0 gts-annobin.so.0.0.0
+rm -f annobin.so annobin.so.0 gts-annobin.so gts-annobin.so.0
+ln -s gts-annobin.so.0.0.0 gts-annobin.so
+ln -s gts-annobin.so.0.0.0 gts-annobin.so.0
+
+popd
 
 # Also install a copy of the sources into the build tree.
 mkdir -p                            %{buildroot}%{annobin_source_dir}
@@ -481,6 +492,11 @@ cp %{_sourcedir}/%{annobin_sources} %{buildroot}%{annobin_source_dir}/latest-ann
 
 rm -f %{buildroot}%{_infodir}/dir
 
+# When annocheck is disabled, annocheck.1.gz will still be generated, remove it.
+%if %{without annocheck}
+rm -f %{_mandir}/man1/annocheck.1.gz
+%endif
+
 #---------------------------------------------------------------------------------
 
 %if %{with tests}
@@ -488,7 +504,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # The first "make check" is run with "|| :" so that we can capture any logs
 # from failed tests.  The second "make check" is there so that the build
 # will fail if any of the tests fail.
-make check GCC=%gcc_for_annobin || :
+make check GCC=%gcc_for_annobin CC=%gcc_for_annobin || :
 if [ -f tests/test-suite.log ]; then
     cat tests/test-suite.log
 fi
@@ -497,7 +513,7 @@ fi
 #   uuencode tests/tmp_atexit/atexit.strip atexit.strip
 
 # Now repeat the tests so that we get the correct exit code.
-make check GCC=%gcc_for_annobin
+make check GCC=%gcc_for_annobin CC=%gcc_for_annobin
 %endif
 
 #---------------------------------------------------------------------------------
@@ -530,16 +546,18 @@ make check GCC=%gcc_for_annobin
 %files plugin-gcc
 %dir %{ANNOBIN_GCC_PLUGIN_DIR}
 
-%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
+%{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so
-%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
+%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so
 
-%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
+%{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so.0
-%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
+%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so.0
 
-%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
+%{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so.0.0.0
-%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
+%verify(owner) %{ANNOBIN_GCC_PLUGIN_DIR}/gts-annobin.so.0.0.0
 
 %{ANNOBIN_GCC_PLUGIN_DIR}/%{aver}
+
+%dir %{annobin_source_dir}
 %{annobin_source_dir}/latest-annobin.tar.xz
 %endif
 
@@ -557,6 +575,72 @@ make check GCC=%gcc_for_annobin
 #---------------------------------------------------------------------------------
 
 %changelog
+* Tue Feb 18 2025 Nick Clifton  <nickc@redhat.com> - 12.92-1
+- Rebase to bring in improvements for locating string notes.  (RHEL-79974)
+- Annocheck: Do not rely upon libelf's ability to detect links to separate debuginfo files.  (RHEL-79264)
+- Annocheck: Fix resource leak.  (RHEL-79253)
+- Annocheck: Fix double free. Add special handling for COMBOOT modules.
+- Annocheck: Improve diagnostics when a separate debug info file cannot be found.
+- Annocheck: Look for -fstack-clash-protection in DW_AT_producer string.  (RHEL-77328)
+- Annocheck: Fix locating string notes (again).  Add exception for glibc benchmark tests.  (RHEL-76456)
+- Annocheck: Add crtoffloadtableS.o to list of known gcc binaries.  (RHEL-760404)
+- Annocheck: Fix the --debug-dir option.
+- Annocheck: Fix corrupt warning message when unable to locate separate debug info files.
+- Annocheck: Remove spurious debugging messages.
+- Annocheck: Always look for annobin notes in separate debug info files.  (RHEL-75778)
+- Annocheck: Support multiple --debug-rpm and --debug-file options.  (RHEL-73349)
+- Annocheck: Add support for sys-root'ed glibc packages.  (RHEL-71296)
+- GCC Plugin: Tidy up use of gcc's diagnoatic headers.  (#32429)
+- Testsuite: Use configured compiler when running tests.
+- GCC Plugin: Fix building with gcc 15.  (#32429)
+- Annocheck: Fix overly long debug messages.
+- Annocheck: Rename rwx-seg test to load-segments.  Add more checks.  Add check for gaps as a future fail.
+- Annocheck: Add --no-allow-excpetions to disable exceptions for known special binaries.
+- Annocheck: Add --enable-future to enable future fail components in normal tests.
+- Annocheck: Fix bug preventing the inclusion of the rpm name in reports.
+- Annocheck: Add more exceptions for gcc binaries.  (RHEL-33365)
+- Annocheck: Add --skip-passes option.
+- Annocheck: Add exceptions for gcc binaries.  (RHEL-33365)
+- Annocheck: Skip property note test for i386 binaries created by LLVM.  (#2323797)
+- Annocheck: Skip FORTIFY and GLIBC_ASSERTIONS tests for LLVM produced binaries with unparseable DW_AT_producer attributes in their DWARF debug info.  (RHEL-65411)
+- GCC Plugin: Change type of the .annobin.notes section from SHT_STRTAB to SHT_PROGBITS.
+
+* Mon Jan 06 2025 Nick Clifton  <nickc@redhat.com> - 12.69-2
+- NVR bump to allow rebuilding against LLVM version 18.  (RHEL-50803)
+
+* Mon Aug 12 2024 Nick Clifton  <nickc@redhat.com> - 12.69-1
+- BuiltBy: Fix seg-fault when comparing language version strings.  (RHEL-53497)
+- Spec File: Use correct names for the symlinks.  (RHEL-53572)
+
+* Fri Aug 09 2024 Nick Clifton  <nickc@redhat.com> - 12.65-3
+- Spec File: Use correct names for the symlinks.  (RHEL-53572)
+
+* Thu Aug 01 2024 Nick Clifton  <nickc@redhat.com> - 12.65-2
+- Spec File: Rebase annobin-tmp-default-to-using-group-attach.patch.
+
+* Tue Jul 30 2024 Nick Clifton  <nickc@redhat.com> - 12.65-1
+- Rebase to 12.65.  (RHEL-51018)
+- Annocheck: Fix recording arguments for later re-use.  (RHEL-50802)
+- GCC Plugin: Fix building AArch64 components with gcc earlier than 11.3.
+- Annocheck: Add improvements to the builtby utility.
+- Annocheck: Add support for ADA binaries.
+- Annocheck: Add support for binaries built from more than two high level source languages.
+- Annocheck: Add support for object files containing no executable code.
+- Annocheck: Do not FAIL LLVM compiled binaries that have not been built with sanitize-cfi and/or sanitize-safe-stack.
+- Annocheck: Add support for Fortran binaries.
+- Annocheck: Add heuristic for detecting parts of the CGO runtime library.
+- Annocheck: Add improvements for handling Clang runtime binaries.
+- Annocheck: Add tweaks for mixed Rust/C binaries.  (#2284605)
+- Annocheck: Add more glibc source file names.
+- Annocheck: Skip GAPS test for GO binaries.  (RHEL-36308)
+- Annocheck: Remove some false positives for Rust binaries.  (#2280239)
+- Annocheck: Defer passing the branch protection test until all notes have been checked.
+- GCC Plugin: Add extra code for detecting the branch protection setting.  (RHEL-35958)
+
+* Mon Jul 29 2024 Nick Clifton  <nickc@redhat.com> - 12.52-1
+- Rebuild with LLVM 18.  (RHEL-50803)
+- Rebase to 12.52 in order to bring in fixes for LLVM 18.
+
 * Tue Nov 28 2023 Nick Clifton  <nickc@redhat.com> - 12.32-2
 - GCC Plugin: Add %%verify tokens to show that the default plugin names are symbolic links. (RHEL-17505)
 
@@ -579,15 +663,13 @@ make check GCC=%gcc_for_annobin
 * Mon Jul 17 2023 Nick Clifton  <nickc@redhat.com> - 12.20-1
 - Annocheck: Ignore AArch64 $x and $d symbols.  (#2221192)
 - GCC Plugin: Suppress active checks for fortran sources.  Improve scanning of COLLECT_GCC_OPTIONS.
-
-* Mon Jul 03 2023 Nick Clifton  <nickc@redhat.com> - 12.18-1
 - Annocheck: Remove dependency upon libiberty.
 
 * Fri Jun 30 2023 Nick Clifton  <nickc@redhat.com> - 12.17-1
-- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps.  (#2217864)
+- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps.  (#2217868)
 
 * Tue Jun 27 2023 Nick Clifton  <nickc@redhat.com> - 12.16-1
-- Spec File: Rebuild with annobin annotation.  (#2217814)
+- Spec File: Rebuild with annobin annotation.  (#2217812)
 - Annocheck: Ignore weak/undef function symbols when checking to see if a binary contains code.  (#2217840)
 - Annocheck: Add --suppress-version-warnings option.
 
@@ -595,16 +677,17 @@ make check GCC=%gcc_for_annobin
 - Annocheck: Do not ignore separate debuginfo files that do not contain any DWARF.  (#2144553)
 - Annocheck: Ignore /dev/null filename in string notes.
 - Annocheck: More tweaks to glibc detection heuristics.  (#2215968)
+- Annocheck: Check for string notes in separate debug info files.  (#2211694)
+- Annocheck: Add support for el10 and rhel-10 profiles.  (RHEL-526)
 
-* Wed Jun 07 2023 Nick Clifton  <nickc@redhat.com> - 12.12-1
+* Tue May 09 2023 Nick Clifton  <nickc@redhat.com> - 12.10-2
-- Rebuild against GTS-13 gcc.  (#2196505)
+- Rebuild against GTS-13 gcc.  (#2196506)
 
-* Tue May 02 2023 Nick Clifton  <nickc@redhat.com> - 12.10-1
+* Wed May 03 2023 Nick Clifton  <nickc@redhat.com> - 12.10-1
-- Add gating.yaml file.  (#2192492)
+- Add gating.yaml file.  (#2192491)
-- Annocheck: Suppress more tests for Rust binaries.
 
 * Tue Apr 25 2023 Nick Clifton  <nickc@redhat.com> - 12.09-1
-- Rebase to 12.09  (#2144553)
+- Rebase to 12.09  (#2188638)
 
 * Tue Apr 25 2023 Nick Clifton  <nickc@redhat.com> - 12.09-1
 - Annocheck: Fix detection of missing plugin options.  (#2189492)