From 7ae9143f2062f3eb7802d8fcb2d663bf8d1579e5 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 06 2024 23:54:35 +0000
Subject: Consolidate gcc packages


---

diff --git a/prepopulate.json b/prepopulate.json
index afbfabc..e34afb0 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -910,6 +910,7 @@
         "libasan.aarch64",
         "libgccjit-devel.aarch64",
         "libgccjit.aarch64",
+        "libhwsan.aarch64",
         "libitm-devel.aarch64",
         "libitm.aarch64",
         "liblsan.aarch64",
@@ -13966,8 +13967,10 @@
         "libgccjit.s390x",
         "libitm-devel.s390x",
         "libitm.s390x",
+        "liblsan.s390x",
         "libstdc++-devel.s390x",
         "libstdc++-docs.s390x",
+        "libtsan.s390x",
         "libubsan.s390x"
       ],
       "gcr": [
@@ -20505,13 +20508,16 @@
         "cpp.x86_64",
         "gcc-c++.x86_64",
         "gcc-gfortran.x86_64",
+        "gcc-offload-amdgcn.x86_64",
         "gcc-offload-nvptx.x86_64",
         "gcc-plugin-annobin.x86_64",
         "gcc.x86_64",
         "libasan.x86_64",
         "libgccjit-devel.x86_64",
         "libgccjit.x86_64",
+        "libgomp-offload-amdgcn.x86_64",
         "libgomp-offload-nvptx.x86_64",
+        "libhwsan.x86_64",
         "libitm-devel.x86_64",
         "libitm.x86_64",
         "liblsan.x86_64",
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 22c65b4..41cca6f 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -169,7 +169,6 @@ additional_packages = [
             "keylime-verifier", #ENGCMP-2419
             "libadwaita", #ENGCMP-3651
             "libarchive-devel", #ENGCMP-4182
-            "libasan8", #ENGCMP-2405
             "libblkio", #ENGCMP-3149
             "libgpiod", #ENGCMP-2433
             "libgpiod-devel", #ENGCMP-2433
@@ -180,7 +179,6 @@ additional_packages = [
             "libnvme", #ENGCMP-2358
             "libnxz", #ENGCMP-2576
             "libsepol-utils", #ENGCMP-2399
-            "libtsan2", #ENGCMP-2405
             "libvirt-daemon-common", # ENGCMP-3046
             "libvirt-daemon-lock", # ENGCMP-3046
             "libvirt-daemon-log", # ENGCMP-3046
@@ -366,22 +364,16 @@ additional_packages = [
              "virt-dib",
              "vorbis-tools",
              "s390utils", #ENGCMP-3606
-             "libhwasan", #ENGCMP-4019
-             "gcc-offload-amdgcn", #ENGCMP-4019
-             "libgomp-offload-amdgcn", #ENGCMP-4019
          ],
          "aarch64": [
              "virt-dib",
              "rhc-worker-playbook", #ENGCMP-3127
              "s390utils", #ENGCMP-3606
-             "libhwasan", #ENGCMP-4019
          ],
          "s390x": [
              "libzpc", #ENGCMP-2756
              "virt-dib",
              "libbpf-tools", #ENGCMP-3842
-             "liblsan", #ENGCMP-4019
-             "libtsan", #ENGCMP-4019
          ],
          "ppc64le": [
              "vorbis-tools",