MdePkg: Remove RVCT support

RVCT is obsolete and no longer used.
Remove support for it.

Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/MdePkg/Include/Arm/ProcessorBind.h b/MdePkg/Include/Arm/ProcessorBind.h
index 5a8204ba2e662ba6f2ef685624c6a9f820153d9d..3d924f19a35d149e1e6e96e239d3862cee778b8a 100644 (file)
--- a/MdePkg/Include/Arm/ProcessorBind.h
+++ b/MdePkg/Include/Arm/ProcessorBind.h
@@ -72,9 +72,9 @@
 #endif\r
 \r
 //\r
-// RVCT and MSFT don't support the __builtin_unreachable() macro\r
+// MSFT doesn't support the __builtin_unreachable() macro\r
 //\r
-#if defined (__ARMCC_VERSION) || defined (_MSC_EXTENSIONS)\r
+#if defined (_MSC_EXTENSIONS)\r
 #define UNREACHABLE()\r
 #endif\r
 \r

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index ce7bdedd34e270d9a3ed2ada6177b77ae3bb7cf1..d19ddfe4bba78465d69edd96aa9696c339875a6b 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -204,15 +204,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r
 #endif\r
 \r
-#ifdef __CC_ARM\r
-//\r
-// Older RVCT ARM compilers don't fully support #pragma pack and require __packed\r
-// as a prefix for the structure.\r
-//\r
-#define PACKED  __packed\r
-#else\r
 #define PACKED\r
-#endif\r
 \r
 ///\r
 /// 128 bit buffer containing a unique identifier value.\r
@@ -578,39 +570,7 @@ struct _LIST_ENTRY {
 **/\r
 #define _INT_SIZE_OF(n)  ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))\r
 \r
-#if defined (__CC_ARM)\r
-//\r
-// RVCT ARM variable argument list support.\r
-//\r
-\r
-///\r
-/// Variable used to traverse the list of arguments. This type can vary by\r
-/// implementation and could be an array or structure.\r
-///\r
-  #ifdef __APCS_ADSABI\r
-typedef int *va_list[1];\r
-#define VA_LIST  va_list\r
-  #else\r
-typedef struct __va_list {\r
-  void    *__ap;\r
-} va_list;\r
-#define VA_LIST  va_list\r
-  #endif\r
-\r
-#define VA_START(Marker, Parameter)  __va_start(Marker, Parameter)\r
-\r
-#define VA_ARG(Marker, TYPE)  __va_arg(Marker, TYPE)\r
-\r
-#define VA_END(Marker)  ((void)0)\r
-\r
-// For some ARM RVCT compilers, __va_copy is not defined\r
-  #ifndef __va_copy\r
-#define __va_copy(dest, src)  ((void)((dest) = (src)))\r
-  #endif\r
-\r
-#define VA_COPY(Dest, Start)  __va_copy (Dest, Start)\r
-\r
-#elif defined (_M_ARM) || defined (_M_ARM64)\r
+#if defined (_M_ARM) || defined (_M_ARM64)\r
 //\r
 // MSFT ARM variable argument list support.\r
 //\r

diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index 950f5229b2a4fd37d5255718e5d0dd150c261b92..c4cd29a7839d53e6cb7f50a9f6d154397a46bcd9 100644 (file)
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -47,8 +47,6 @@
   Ebc/CpuSleepFlushTlb.c\r
 \r
 [Sources.ARM]\r
-  Arm/CpuFlushTlb.asm | RVCT\r
-  Arm/CpuSleep.asm    | RVCT\r
   Arm/CpuFlushTlb.asm | MSFT\r
   Arm/CpuSleep.asm    | MSFT\r
   Arm/CpuFlushTlb.S   | GCC\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
index cea6857926b3dec4f6c0593a2ae2289b75f73286..e803abc0b171aae0c50e8a63c0cd97dc17f8a451 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf
@@ -31,7 +31,6 @@
 [Sources.ARM]\r
   IoLibArmVirt.c\r
   Arm/ArmVirtMmio.S       | GCC\r
-  Arm/ArmVirtMmio.asm     | RVCT\r
 \r
 [Sources.AARCH64]\r
   IoLibArmVirt.c\r

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 16b7ac3917054f8001bfd6b0a1e8e31dd668bfdc..6be5be9428f21cfd1a58bde86c8173a7dfb77836 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -341,19 +341,8 @@
 [Sources.ARM]\r
   Arm/InternalSwitchStack.c\r
   Arm/Unaligned.c\r
-  Math64.c                   | RVCT\r
   Math64.c                   | MSFT\r
 \r
-  Arm/SwitchStack.asm        | RVCT\r
-  Arm/SetJumpLongJump.asm    | RVCT\r
-  Arm/DisableInterrupts.asm  | RVCT\r
-  Arm/EnableInterrupts.asm   | RVCT\r
-  Arm/GetInterruptsState.asm | RVCT\r
-  Arm/CpuPause.asm           | RVCT\r
-  Arm/CpuBreakpoint.asm      | RVCT\r
-  Arm/MemoryFence.asm        | RVCT\r
-  Arm/SpeculationBarrier.S   | RVCT\r
-\r
   Arm/SwitchStack.asm        | MSFT\r
   Arm/SetJumpLongJump.asm    | MSFT\r
   Arm/DisableInterrupts.asm  | MSFT\r

diff --git a/MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf b/MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf
index d09bd12bef19dcd994ce89f0045ca887478a12c0..09a610c31c1d5bd2fafef8b825ba2bba339d81c5 100644 (file)
--- a/MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf
+++ b/MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf
@@ -180,16 +180,8 @@
 [Sources.ARM]\r
   Arm/InternalSwitchStack.c\r
   Arm/Unaligned.c\r
-  Math64.c                   | RVCT\r
   Math64.c                   | MSFT\r
 \r
-  Arm/SwitchStack.asm        | RVCT\r
-  Arm/SetJumpLongJump.asm    | RVCT\r
-  Arm/CpuPause.asm           | RVCT\r
-  Arm/CpuBreakpoint.asm      | RVCT\r
-  Arm/MemoryFence.asm        | RVCT\r
-  Arm/SpeculationBarrier.S   | RVCT\r
-\r
   Arm/SwitchStack.asm        | MSFT\r
   Arm/SetJumpLongJump.asm    | MSFT\r
   Arm/CpuPause.asm           | MSFT\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
index e4e3d532e7b85fb9691f308bd9b2de803480dd1b..366a6c6f64a096b4009a6d114c7ebd20971fbf0d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
@@ -85,12 +85,6 @@
   Arm/CompareMem.S    |GCC\r
   Arm/CompareGuid.S   |GCC\r
 \r
-  Arm/ScanMem.asm     |RVCT\r
-  Arm/SetMem.asm      |RVCT\r
-  Arm/CopyMem.asm     |RVCT\r
-  Arm/CompareMem.asm  |RVCT\r
-  Arm/CompareGuid.asm |RVCT\r
-\r
 [Sources.AARCH64]\r
   AArch64/ScanMem.S\r
   AArch64/SetMem.S\r

diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
index 0dc3c4a83aa50bc32c510be55652454448621095..b827645d72b9dbf8d6643d9b2374a287913126f8 100644 (file)
--- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
@@ -26,7 +26,6 @@
 \r
 [Sources]\r
   BaseStackCheckGcc.c  | GCC\r
-  BaseStackCheckGcc.c  | RVCT\r
   BaseStackCheckNull.c | MSFT\r
 \r
 [Packages]\r

diff --git a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
index 83d5b8ed7c9b8c80f648b947f77a0b01074b3851..02ba12961a1990eb1cf9b7404eced8bf0b0282f5 100755 (executable)
--- a/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+++ b/MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
@@ -71,7 +71,6 @@
 \r
 [Sources.ARM]\r
   Synchronization.c\r
-  Arm/Synchronization.asm       | RVCT\r
   Arm/Synchronization.S         | GCC\r
 \r
 [Sources.AARCH64]\r