Revert "Adding support of building BaseTool for Windows ARM (#323)"

This reverts commit ba628fa.

Author: kuqin12

BaseTools/Source/C/GenFw/GenFw.c

@@ -1141,7 +1141,7 @@ Routine Description:
   UINT32                           OutputFileLength;
   UINT8                            *InputFileBuffer;
   UINT32                           InputFileLength;
-  PD_RUNTIME_FUNCTION              *RuntimeFunction;  // MU_CHANGE: Resolve definition conflict for ARM
+  RUNTIME_FUNCTION                 *RuntimeFunction;
   UNWIND_INFO                      *UnwindInfo;
   STATUS                           Status;
   BOOLEAN                          ReplaceFlag;
@@ -2555,10 +2555,8 @@ Routine Description:
               //
               memset (SectionHeader->Name, 0, sizeof (SectionHeader->Name));
 
-              // MU_CHANGE Starts: Resolve definition conflict for ARM
-              RuntimeFunction = (PD_RUNTIME_FUNCTION *)(FileBuffer + SectionHeader->PointerToRawData);
-              for (Index1 = 0; Index1 < Optional64->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size / sizeof (PD_RUNTIME_FUNCTION); Index1++, RuntimeFunction++) {
-              // MU_CHANGE Ends
+              RuntimeFunction = (RUNTIME_FUNCTION *)(FileBuffer + SectionHeader->PointerToRawData);
+              for (Index1 = 0; Index1 < Optional64->DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size / sizeof (RUNTIME_FUNCTION); Index1++, RuntimeFunction++) {
                 SectionHeader = (EFI_IMAGE_SECTION_HEADER *) ((UINT8 *) &(PeHdr->Pe32.OptionalHeader) + PeHdr->Pe32.FileHeader.SizeOfOptionalHeader);
                 for (Index2 = 0; Index2 < PeHdr->Pe32.FileHeader.NumberOfSections; Index2++, SectionHeader++) {
                   if (RuntimeFunction->UnwindInfoAddress >= SectionHeader->VirtualAddress && RuntimeFunction->UnwindInfoAddress < (SectionHeader->VirtualAddress + SectionHeader->SizeOfRawData)) {
@@ -2570,7 +2568,7 @@ Routine Description:
                     break;
                   }
                 }
-                memset (RuntimeFunction, 0, sizeof (PD_RUNTIME_FUNCTION)); // MU_CHANGE: Resolve definition conflict for ARM
+                memset (RuntimeFunction, 0, sizeof (RUNTIME_FUNCTION));
               }
               //
               // Zero Exception Table

BaseTools/Source/C/Makefiles/ms.common

@@ -69,15 +69,6 @@ SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64
 # Note: These are bit-width conversion related warning suppressions.
 CFLAGS = $(CFLAGS) /wd4267 /wd4244 /wd4334
 
-# MU_CHANGE Starts: Adding support to build base tools for ARM
-!ELSEIF "$(HOST_ARCH)"=="ARM"
-ARCH_INCLUDE = $(EDK2_PATH)\MdePkg\Include\Arm
-BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32
-LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32
-SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
-SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
-# MU_CHANGE Ends
-
 !ELSE
 !ERROR "Bad HOST_ARCH"
 !ENDIF

MdePkg/Include/IndustryStandard/PeImage.h

@@ -700,7 +700,7 @@ typedef struct {
   UINT32    FunctionStartAddress;
   UINT32    FunctionEndAddress;
   UINT32    UnwindInfoAddress;
-} PD_RUNTIME_FUNCTION; // MU_CHANGE: Resolve definition conflict in winnt.h for ARM target.
+} RUNTIME_FUNCTION;
 
 typedef struct {
   UINT8    Version             : 3;