From baecba68a32b26778e902faed64f2e701e584531 Mon Sep 17 00:00:00 2001
From: Ashraf Ali <ashraf.ali.s@intel.com>
Date: Sun, 11 Aug 2024 21:58:00 +0530
Subject: [PATCH] MdePkg: Remove duplicate source from BaseMemoryLib INF files

Signed-off-by: Ashraf Ali <ashraf.ali.s@intel.com>
---
 .../BaseMemoryLibMmx/BaseMemoryLibMmx.inf     | 23 --------
 .../BaseMemoryLibOptDxe.inf                   | 11 ----
 .../BaseMemoryLibOptPei.inf                   | 53 +++++--------------
 .../BaseMemoryLibRepStr.inf                   | 22 --------
 .../BaseMemoryLibSse2/BaseMemoryLibSse2.inf   | 22 --------
 5 files changed, 14 insertions(+), 117 deletions(-)

diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
index c470fa442b..18fc5875e2 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
@@ -46,17 +46,6 @@
   MemLibInternals.h
 
 [Sources.Ia32]
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
   Ia32/ScanMem64.nasm
   Ia32/ScanMem32.nasm
   Ia32/ScanMem16.nasm
@@ -82,20 +71,8 @@
   X64/SetMem16.nasm
   X64/SetMem.nasm
   X64/CopyMem.nasm
-  X64/ScanMem64.nasm
-  X64/ScanMem32.nasm
-  X64/ScanMem16.nasm
-  X64/ScanMem8.nasm
-  X64/CompareMem.nasm
-  X64/SetMem64.nasm
-  X64/SetMem32.nasm
-  X64/SetMem16.nasm
-  X64/ZeroMem.nasm
-  X64/SetMem.nasm
-  X64/CopyMem.nasm
   X64/IsZeroBuffer.nasm
 
-
 [LibraryClasses]
   DebugLib
   BaseLib
diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index 366a6c6f64..6a7fa9a565 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -29,17 +29,6 @@
   MemLibInternals.h
 
 [Sources.Ia32]
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
   Ia32/ScanMem64.nasm
   Ia32/ScanMem32.nasm
   Ia32/ScanMem16.nasm
diff --git a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
index 0bb4b7ce5e..43c2cc2a0a 100644
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
+++ b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
@@ -27,31 +27,6 @@
 
 [Sources]
   MemLibInternals.h
-
-[Sources.Ia32]
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
-  Ia32/IsZeroBuffer.nasm
   ScanMem64Wrapper.c
   ScanMem32Wrapper.c
   ScanMem16Wrapper.c
@@ -66,6 +41,20 @@
   IsZeroBufferWrapper.c
   MemLibGuid.c
 
+[Sources.Ia32]
+  Ia32/ScanMem64.nasm
+  Ia32/ScanMem32.nasm
+  Ia32/ScanMem16.nasm
+  Ia32/ScanMem8.nasm
+  Ia32/CompareMem.nasm
+  Ia32/ZeroMem.nasm
+  Ia32/SetMem64.nasm
+  Ia32/SetMem32.nasm
+  Ia32/SetMem16.nasm
+  Ia32/SetMem.nasm
+  Ia32/CopyMem.nasm
+  Ia32/IsZeroBuffer.nasm
+
 [Sources.X64]
   X64/ScanMem64.nasm
   X64/ScanMem32.nasm
@@ -79,20 +68,6 @@
   X64/SetMem.nasm
   X64/CopyMem.nasm
   X64/IsZeroBuffer.nasm
-  ScanMem64Wrapper.c
-  ScanMem32Wrapper.c
-  ScanMem16Wrapper.c
-  ScanMem8Wrapper.c
-  ZeroMemWrapper.c
-  CompareMemWrapper.c
-  SetMem64Wrapper.c
-  SetMem32Wrapper.c
-  SetMem16Wrapper.c
-  SetMemWrapper.c
-  CopyMemWrapper.c
-  IsZeroBufferWrapper.c
-  MemLibGuid.c
-
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
index 9d4f8769c0..59983d0a0c 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -42,17 +42,6 @@
   MemLibGuid.c
 
 [Sources.Ia32]
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
   Ia32/ScanMem64.nasm
   Ia32/ScanMem32.nasm
   Ia32/ScanMem16.nasm
@@ -67,17 +56,6 @@
   Ia32/IsZeroBuffer.nasm
 
 [Sources.X64]
-  X64/ScanMem64.nasm
-  X64/ScanMem32.nasm
-  X64/ScanMem16.nasm
-  X64/ScanMem8.nasm
-  X64/CompareMem.nasm
-  X64/ZeroMem.nasm
-  X64/SetMem64.nasm
-  X64/SetMem32.nasm
-  X64/SetMem16.nasm
-  X64/SetMem.nasm
-  X64/CopyMem.nasm
   X64/ScanMem64.nasm
   X64/ScanMem32.nasm
   X64/ScanMem16.nasm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
index 79618c9fd5..69a29a1b7d 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
@@ -41,17 +41,6 @@
   MemLibGuid.c
 
 [Sources.Ia32]
-  Ia32/ScanMem64.nasm
-  Ia32/ScanMem32.nasm
-  Ia32/ScanMem16.nasm
-  Ia32/ScanMem8.nasm
-  Ia32/CompareMem.nasm
-  Ia32/ZeroMem.nasm
-  Ia32/SetMem64.nasm
-  Ia32/SetMem32.nasm
-  Ia32/SetMem16.nasm
-  Ia32/SetMem.nasm
-  Ia32/CopyMem.nasm
   Ia32/ScanMem64.nasm
   Ia32/ScanMem32.nasm
   Ia32/ScanMem16.nasm
@@ -66,17 +55,6 @@
   Ia32/IsZeroBuffer.nasm
 
 [Sources.X64]
-  X64/ScanMem64.nasm
-  X64/ScanMem32.nasm
-  X64/ScanMem16.nasm
-  X64/ScanMem8.nasm
-  X64/CompareMem.nasm
-  X64/ZeroMem.nasm
-  X64/SetMem64.nasm
-  X64/SetMem32.nasm
-  X64/SetMem16.nasm
-  X64/SetMem.nasm
-  X64/CopyMem.nasm
   X64/ScanMem64.nasm
   X64/ScanMem32.nasm
   X64/ScanMem16.nasm