11diff --git a/BaseTools/Scripts/GccBase.lds b/BaseTools/Scripts/GccBase.lds
2- index 9f27e83bb0..79e8c9f023 100644
2+ index 3d2a97ddeb..c9e35af0c1 100644
33--- a/BaseTools/Scripts/GccBase.lds
44+++ b/BaseTools/Scripts/GccBase.lds
5- @@ -21 ,6 +21 ,7 @@ SECTIONS {
5+ @@ -27 ,6 +27 ,7 @@ SECTIONS {
66 . = PECOFF_HEADER_SIZE;
77
88 .text : ALIGN(CONSTANT(COMMONPAGESIZE)) {
99+ _textbsa = .;
10+ KEEP(*(.entry))
1011 *(.text .text.* .stub .gnu.linkonce.t.*)
1112 *(.rodata .rodata.* .gnu.linkonce.r.*)
12- *(.got .got.*)
1313diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
14- index 17e48443ac..a2b3adefdf 100644
14+ index 17e48443ac..ddf56f0cd6 100644
1515--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
1616+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
1717@@ -16,6 +16,9 @@
@@ -30,29 +30,29 @@ index 17e48443ac..a2b3adefdf 100644
3030
3131+ mySystemTable = SystemTable;
3232+ myImageHandle = ImageHandle;
33- +
33+ +
3434 Status = SystemTable->BootServices->OpenProtocol (
3535 ImageHandle,
3636 &gEfiShellParametersProtocolGuid,
3737diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
38- index 5303a68959..7ccbce272b 100644
38+ index 94d95de0eb..4a70e2857a 100644
3939--- a/ShellPkg/ShellPkg.dsc
4040+++ b/ShellPkg/ShellPkg.dsc
41- @@ -27 ,6 +27 ,9 @@
42- UefiDriverEntryPoint| MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
43- UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
44- DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
41+ @@ -23 ,6 +23 ,9 @@
42+ !include MdePkg/MdeLibs.dsc.inc
43+
44+ [LibraryClasses.common]
4545+ ValLib|ShellPkg/Application/sysarch-acs/val/ValLib.inf
4646+ PalLib|ShellPkg/Application/sysarch-acs/pal/uefi_acpi/PalLib.inf
4747+ LibCFlat|ShellPkg/Application/sysarch-acs/mem_test/LibCFlat.inf
48- !if $(TARGET) == RELEASE
49- DebugLib |MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull .inf
50- !else
51- @@ -97 ,6 +100 ,7 @@
52- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
53- ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
54- ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
48+ UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
49+ UefiDriverEntryPoint |MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint .inf
50+ UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
51+ @@ -79 ,6 +82 ,7 @@
52+ # Build all the libraries when building this package.
53+ # This helps developers test changes and how they affect the package.
54+ #
5555+ ShellPkg/Application/sysarch-acs/apps/uefi/Mem.inf
56-
57- ShellPkg/Application/Shell/Shell .inf {
58- <PcdsFixedAtBuild>
56+ ShellPkg/Library/UefiShellLib/UefiShellLib.inf
57+ ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib .inf
58+ ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
0 commit comments