From 79efb514d836aaafc11636dd2c9546645355866a Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 14 Dec 2021 17:39:59 +0000
Subject: [PATCH] 10.38: Annocheck: Add special case for gaps on RHEL-7

---
 annobin-global.h         | 2 +-
 annocheck/hardened.c     | 8 +++++++-
 annocheck/libannocheck.h | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/annobin-global.h b/annobin-global.h
index 2064de4..a44eb4f 100644
--- a/annobin-global.h
+++ b/annobin-global.h
@@ -23,7 +23,7 @@ extern "C" {
 
    NB/ Keep this value in sync with libannochck_version defined in
    annocheck/libannocheck.h.  */
-#define ANNOBIN_VERSION 1037
+#define ANNOBIN_VERSION 1038
 
 /* The version of the annotation specification supported.  */
 #define SPEC_VERSION  3
diff --git a/annocheck/hardened.c b/annocheck/hardened.c
index efc4088..4161f71 100644
--- a/annocheck/hardened.c
+++ b/annocheck/hardened.c
@@ -4236,7 +4236,13 @@ skip_gap_sym (annocheck_data * data, const char * sym)
     }
   per_file.component_name = saved_sym;
 
-  if (per_file.e_machine == EM_386)
+  if (per_file.e_machine == EM_X86_64)
+    {
+      /* See BZ 2031133 for example of this happening with RHEL-7 builds.  */
+      if (const_strneq (sym, "deregister_tm_clones"))
+	return true;
+    }
+  else if (per_file.e_machine == EM_386)
     {
       if (const_strneq (sym, "__x86.get_pc_thunk")
 	  || const_strneq (sym, "_x86_indirect_thunk_"))
diff --git a/annocheck/libannocheck.h b/annocheck/libannocheck.h
index ce024ed..0006bd4 100644
--- a/annocheck/libannocheck.h
+++ b/annocheck/libannocheck.h
@@ -18,7 +18,7 @@ extern "C" {
 
 /* NB/ Keep this value in sync with ANNOBIN_VERSION defined in
    annobin-global.h.  */
-const unsigned int libannocheck_version = 1037;
+const unsigned int libannocheck_version = 1038;
 
 typedef enum libannocheck_error
 {
-- 
2.43.5