diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index f4df579f7d..94ae60e251 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -134,8 +134,8 @@
     <Command.XCODE>
         "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -o ${dst} $(INC) ${src}
 
-## Early stages on ARM/AArch64 execute with strict alignment enabled and will crash,
-#  when compiler generates misaligned access.
+## Early stages on ARM/AArch64 execute with strict alignment enabled and will crash,
+#  when compiler generates misaligned access.
 #
 [C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
     <InputFile>
@@ -360,15 +360,10 @@
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
 
     <Command.GCC, Command.CLANGGCC>
-        $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
-        $(OBJCOPY) $(OBJCOPY_STRIPFLAG) ${src}
+        $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).strip
+        $(OBJCOPY) $(OBJCOPY_STRIPFLAG) $(DEBUG_DIR)(+)$(MODULE_NAME).strip
 
-        #
-        # The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly
-        #
-        -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
-        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
-        ImageTool ElfToPe ${src} ${dst} $(MODULE_TYPE)
+        ImageTool ElfToPe $(DEBUG_DIR)(+)$(MODULE_NAME).strip ${dst} $(MODULE_TYPE)
 
         $(CP) ${dst} $(DEBUG_DIR)
         $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index a219fe94af..a1c821a90b 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -708,9 +708,6 @@ NOOPT_VS2019_AARCH64_DLINK_FLAGS   = DEF(MSFT_DLINK_COMMON) /MACHINE:ARM64 /DEBU
 *_*_*_OBJCOPY_PATH              = echo
 *_*_*_SYMRENAME_PATH            = echo
 *_*_*_SYMRENAME_FLAGS           = Symbol renaming not needed for
-DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
-RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
-NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
 *_*_*_OBJCOPY_STRIPFLAG            = --strip-unneeded -R .eh_frame
 *_*_*_DTC_FLAGS                    = -H epapr
 *_*_*_DTCPP_PATH                   = DEF(DTCPP_BIN)
diff --git a/BaseTools/Scripts/Base.lds b/BaseTools/Scripts/Base.lds
index 9c13cdbae5..8823db55c2 100644
--- a/BaseTools/Scripts/Base.lds
+++ b/BaseTools/Scripts/Base.lds
@@ -55,7 +55,6 @@ SECTIONS {
 
   /DISCARD/ : {
     *(.note.GNU-stack)
-    *(.gnu_debuglink)
     *(.interp)
     *(.dynsym)
     *(.dynstr)
diff --git a/BaseTools/Scripts/Merge.lds b/BaseTools/Scripts/Merge.lds
index 8d69b4d564..bc5132180b 100644
--- a/BaseTools/Scripts/Merge.lds
+++ b/BaseTools/Scripts/Merge.lds
@@ -52,7 +52,6 @@ SECTIONS {
 
   /DISCARD/ : {
     *(.note.GNU-stack)
-    *(.gnu_debuglink)
     *(.interp)
     *(.dynsym)
     *(.dynstr)