Fixed compilation of all packages tracked by CI after rebasing upon e…

…dk2-stable202405 tag.
acidanthera · Jun 28, 2024 · 1d99eb8 · 1d99eb8
1 parent 9ad5ffd
commit 1d99eb8
Show file tree

Hide file tree

Showing 33 changed files with 119 additions and 590 deletions.
diff --git a/.github/workflows/build_arm.yaml b/.github/workflows/build_arm.yaml
@@ -19,7 +19,7 @@ jobs:
     name: Linux GCC
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -107,7 +107,7 @@ jobs:
         run: zip GCC_fw_arm_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GCC Firmware ARM Artifacts
           path: GCC_fw_arm_artifacts.zip
@@ -116,7 +116,7 @@ jobs:
     name: Linux CLANGDWARF
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -203,7 +203,7 @@ jobs:
         run: zip CLANGDWARF_fw_arm_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CLANGDWARF Firmware ARM Artifacts
           path: CLANGDWARF_fw_arm_artifacts.zip
@@ -222,7 +222,7 @@ jobs:
         ]
     steps:
       - name: Checkout ocbuild repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: acidanthera/ocbuild
           ref: master
@@ -247,7 +247,7 @@ jobs:
           tar -xJf ./qemu-8.1.3.tar.xz -C $HOME
 
       - name: Download a single artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.package.toolchain }} Firmware ARM Artifacts
 

diff --git a/.github/workflows/build_common.yml b/.github/workflows/build_common.yml
@@ -19,7 +19,7 @@ jobs:
     env:
       JOB_TYPE: BUILD
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -144,7 +144,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -253,7 +253,7 @@ jobs:
     name: Linux CLANGPDB
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -377,7 +377,7 @@ jobs:
     name: Linux CLANGDWARF
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -501,7 +501,7 @@ jobs:
     name: Linux GCC
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 

diff --git a/.github/workflows/build_nolto.yaml b/.github/workflows/build_nolto.yaml
@@ -19,7 +19,7 @@ jobs:
     name: Linux GCC ARM
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -110,7 +110,7 @@ jobs:
         run: zip GCC_no_lto_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GCC Firmware NO_LTO Artifacts
           path: GCC_no_lto_artifacts.zip
@@ -119,7 +119,7 @@ jobs:
     name: Linux GCC AMD
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -219,7 +219,7 @@ jobs:
         run: zip GCC_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GCC Firmware Artifacts
           path: GCC_fw_artifacts.zip
@@ -228,7 +228,7 @@ jobs:
     name: Linux GCC Common
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -370,7 +370,7 @@ jobs:
         ]
     steps:
       - name: Checkout ocbuild repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: acidanthera/ocbuild
           ref: master
@@ -395,7 +395,7 @@ jobs:
           tar -xJf ./qemu-8.1.3.tar.xz -C $HOME
 
       - name: Download a single artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.package.toolchain }} Firmware NO_LTO Artifacts
 
@@ -472,7 +472,7 @@ jobs:
         ]
     steps:
       - name: Checkout ocbuild repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: acidanthera/ocbuild
           ref: master
@@ -497,7 +497,7 @@ jobs:
           tar -xJf ./qemu-8.1.3.tar.xz -C $HOME
 
       - name: Download a single artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.package.toolchain }} Firmware Artifacts
 

diff --git a/.github/workflows/build_x86.yaml b/.github/workflows/build_x86.yaml
@@ -21,7 +21,7 @@ jobs:
     env:
       JOB_TYPE: BUILD
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -128,7 +128,7 @@ jobs:
         run: zip XCODE5_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: XCODE5 Firmware Artifacts
           path: XCODE5_fw_artifacts.zip
@@ -142,7 +142,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -238,7 +238,7 @@ jobs:
         run: zip VS2019_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: VS2019 Firmware Artifacts
           path: VS2019_fw_artifacts.zip
@@ -247,7 +247,7 @@ jobs:
     name: Linux CLANGPDB
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -343,7 +343,7 @@ jobs:
         run: zip CLANGPDB_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CLANGPDB Firmware Artifacts
           path: CLANGPDB_fw_artifacts.zip
@@ -352,7 +352,7 @@ jobs:
     name: Linux CLANGDWARF
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -448,7 +448,7 @@ jobs:
         run: zip CLANGDWARF_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CLANGDWARF Firmware Artifacts
           path: CLANGDWARF_fw_artifacts.zip
@@ -457,7 +457,7 @@ jobs:
     name: Linux GCC
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -553,7 +553,7 @@ jobs:
         run: zip GCC_fw_artifacts.zip ./firmware_artifacts/* -r
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: GCC Firmware Artifacts
           path: GCC_fw_artifacts.zip
@@ -575,7 +575,7 @@ jobs:
         ]
     steps:
       - name: Checkout ocbuild repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: acidanthera/ocbuild
           ref: master
@@ -600,7 +600,7 @@ jobs:
           tar -xJf ./qemu-8.1.3.tar.xz -C $HOME
 
       - name: Download a single artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.package.toolchain }} Firmware Artifacts
 

diff --git a/CryptoPkg/Library/IntrinsicLib/CopyMem.c b/CryptoPkg/Library/IntrinsicLib/CopyMem.c
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Base.h>
 #include <Library/BaseMemoryLib.h>
 
+#if !defined (__arm__)
 #if defined (__clang__) && !defined (__APPLE__)
 
 /* Copies bytes between buffers */
@@ -53,3 +54,4 @@ __bzero (
   ZeroMem (src, count);
 }
 #endif
+#endif
diff --git a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
@@ -156,60 +156,3 @@ PhaseFreePool (
 {
   // Not implemented yet
 }
-
-/**
-  Reallocates a buffer of type EfiBootServicesData.
-
-  Allocates and zeros the number bytes specified by NewSize from memory of type
-  EfiBootServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not
-  enough memory remaining to satisfy the request, then NULL is returned.
-
-  If the allocation of the new buffer is successful and the smaller of NewSize and OldSize
-  is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().
-
-  @param  OldSize        The size, in bytes, of OldBuffer.
-  @param  NewSize        The size, in bytes, of the buffer to reallocate.
-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional
-                         parameter that may be NULL.
-
-  @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
-VOID *
-EFIAPI
-ReallocatePool (
-  IN UINTN  OldSize,
-  IN UINTN  NewSize,
-  IN VOID   *OldBuffer  OPTIONAL
-  )
-{
-  VOID  *NewBuffer;
-
-  // Validate the OldBuffer is HobAllocated.
-  DEBUG_CODE_BEGIN ();
-  EFI_HOB_HANDOFF_INFO_TABLE  *HandOffHob;
-
-  if (OldBuffer != NULL) {
-    HandOffHob = GetHobList ();
-    ASSERT (((EFI_PHYSICAL_ADDRESS)(UINTN)OldBuffer >= HandOffHob->EfiMemoryBottom));
-    ASSERT (((EFI_PHYSICAL_ADDRESS)((UINTN)OldBuffer + OldSize) <= HandOffHob->EfiFreeMemoryBottom));
-  }
-
-  DEBUG_CODE_END ();
-
-  // If new buffer would be smaller just return old buffer as FreePool isn't supported.
-  if ((OldBuffer != NULL) && (OldSize >= NewSize)) {
-    return OldBuffer;
-  }
-
-  NewBuffer = AllocateZeroPool (NewSize);
-  if ((NewBuffer != NULL) && (OldBuffer != NULL)) {
-    CopyMem (NewBuffer, OldBuffer, MIN (OldSize, NewSize));
-    FreePool (OldBuffer);
-  }
-
-  return NewBuffer;
-}
diff --git a/MdeModulePkg/Bus/Spi/SpiNorFlashJedecSfdp/SpiNorFlash.c b/MdeModulePkg/Bus/Spi/SpiNorFlashJedecSfdp/SpiNorFlash.c
@@ -49,6 +49,7 @@ FillWriteBuffer (
   UINT8   SfdpAddressBytes;
 
   SfdpAddressBytes = (UINT8)Instance->SfdpBasicFlash->AddressBytes;
+  AddressSize      = 0;
 
   // Copy Opcode into Write Buffer
   Instance->SpiTransactionWriteBuffer[0] = Opcode;

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c b/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
@@ -668,8 +668,7 @@ InsertImageRecord (
       DEBUG ((DEBUG_WARN, "!!!!!!!!  Image - %a  !!!!!!!!\n", PdbPointer));
     }
 
-    Status = EFI_ABORTED;
-    goto Finish;
+    return;
   }
 
   ImageRecord = UefiImageLoaderGetImageRecord (ImageContext);
@@ -686,9 +685,6 @@ InsertImageRecord (
   //
 
   InsertSortImageRecord (ImageRecord);
-
-Finish:
-  return;
 }
 
 /**
@@ -728,7 +724,7 @@ FindImageRecord (
     }
   }
 
-  return;
+  return NULL;
 }
 
 /**