ArmPlatformPkg/patches: Update the 'PendingPatches' on the latest BaseTools syncup

[mirror_edk2.git] / ArmPlatformPkg / Documentation / patches / 0003-BaseTools-Conf-Add-support-for-ARM-GCC-Linux-EABI-to.patch

diff --git a/ArmPlatformPkg/Documentation/patches/0003-BaseTools-Conf-Add-support-for-ARM-GCC-Linux-EABI-to.patch b/ArmPlatformPkg/Documentation/patches/0003-BaseTools-Conf-Add-support-for-ARM-GCC-Linux-EABI-to.patch
deleted file mode 100755 (executable)
index eaf97d2..0000000
--- a/ArmPlatformPkg/Documentation/patches/0003-BaseTools-Conf-Add-support-for-ARM-GCC-Linux-EABI-to.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 289ebaebf3c8c60c5cf09b53108c3ef671b64afe Mon Sep 17 00:00:00 2001
-From: Olivier Martin <olivier.martin@arm.com>
-Date: Thu, 22 Sep 2011 20:46:41 +0100
-Subject: [PATCH 3/3] BaseTools/Conf: Add support for ARM GCC Linux EABI
- toolchain
-
----
- BaseTools/Conf/build_rule.template |   12 ++++----
- BaseTools/Conf/tools_def.template  |   58 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 64 insertions(+), 6 deletions(-)
- mode change 100644 => 100755 BaseTools/Conf/build_rule.template
-
-diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
-old mode 100644
-new mode 100755
-index ff5af1c..c54b091
---- a/BaseTools/Conf/build_rule.template
-+++ b/BaseTools/Conf/build_rule.template
-@@ -129,7 +129,7 @@
-         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
-         "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
- \r
--    <Command.ARMGCC>\r
-+    <Command.ARMGCC, Command.ARMLINUXGCC>\r
-         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
- \r
- \r
-@@ -217,7 +217,7 @@
-     <Command.RVCT>\r
-         "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
-     \r
--    <Command.RVCTCYGWIN, Command.ARMGCC>\r
-+    <Command.RVCTCYGWIN, Command.ARMGCC, Command.ARMLINUXGCC>\r
-         # $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
-         "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
- \r
-@@ -241,7 +241,7 @@
-         "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
-         "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
- \r
--    <Command.ARMGCC>\r
-+    <Command.ARMGCC, Command.ARMLINUXGCC>\r
-         "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
- \r
-     <Command.RVCT>\r
-@@ -271,7 +271,7 @@
-     <Command.GCC>\r
-         "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
- \r
--    <Command.ARMGCC>\r
-+    <Command.ARMGCC, Command.ARMLINUXGCC>\r
-         "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
- \r
-     <Command.RVCT>\r
-@@ -292,7 +292,7 @@
-     <OutputFile>\r
-         $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
- \r
--    <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC>  \r
-+    <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>  \r
-         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
-         $(CP) ${dst} $(OUTPUT_DIR)\r
-         $(CP) ${dst} $(BIN_DIR)\r
-@@ -536,7 +536,7 @@
-         "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
-         "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}\r
-         \r
--    <Command.XCODE, Command.RVCT, Command.ARMGCC>  \r
-+    <Command.XCODE, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>  \r
-         GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)\r
-         \r
-         \r
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 049f29b..20c0033 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4178,6 +4178,64 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-end
-   DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0\r
- RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused\r
- \r
-+####################################################################################\r
-+#\r
-+# ARM GNU/Linux GCC\r
-+#\r
-+####################################################################################\r
-+#  ARMLINUXGCC         - ARM version of the GCC cross compiler\r
-+\r
-+*_ARMLINUXGCC_*_*_FAMILY          = GCC\r
-+*_ARMLINUXGCC_*_*_BUILDRULEFAMILY = ARMLINUXGCC\r
-+\r
-+*_ARMLINUXGCC_*_MAKE_PATH         = make\r
-+*_ARMLINUXGCC_*_MAKE_FLAGS        = --no-print-directory\r
-+\r
-+##################\r
-+# ASL definitions\r
-+##################\r
-+*_ARMLINUXGCC_*_ASL_PATH           = DEF(UNIX_IASL_BIN)\r
-+*_ARMLINUXGCC_*_ASL_FLAGS          = DEF(IASL_FLAGS)\r
-+*_ARMLINUXGCC_*_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)\r
-+*_ARMLINUXGCC_*_ASLPP_FLAGS        = -x c -E -P\r
-+*_ARMLINUXGCC_*_ASLCC_FLAGS        = -x c\r
-+*_ARMLINUXGCC_*_ASLDLINK_FLAGS     = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
-+\r
-+##################\r
-+# ARM definitions\r
-+##################\r
-+\r
-+*_ARMLINUXGCC_ARM_ASLCC_PATH      = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_ASLDLINK_PATH   = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
-+*_ARMLINUXGCC_ARM_ASLPP_PATH      = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+\r
-+*_ARMLINUXGCC_ARM_CC_PATH         = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_SLINK_PATH      = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ar\r
-+*_ARMLINUXGCC_ARM_DLINK_PATH      = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
-+*_ARMLINUXGCC_ARM_ASM_PATH        = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-as\r
-+*_ARMLINUXGCC_ARM_PP_PATH         = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_VFRPP_PATH      = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+\r
-+#\r
-+# Use default values, or override in DSC file\r
-+#\r
-+*_ARMLINUXGCC_ARM_ARCHCC_FLAGS    = -mthumb\r
-+*_ARMLINUXGCC_ARM_ARCHASM_FLAGS   = \r
-+*_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =\r
-+*_ARMLINUXGCC_ARM_PLATFORM_FLAGS  = -march=armv7-a\r
-+\r
-+  DEBUG_ARMLINUXGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g\r
-+RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian\r
-+\r
-+*_ARMLINUXGCC_ARM_PP_FLAGS    = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-+*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+\r
-+*_ARMLINUXGCC_ARM_SLINK_FLAGS =  -rc\r
-+*_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS)  --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-+\r
-+  DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0\r
-+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable\r
-+\r
- #################\r
- # ASM 16 linker defintions\r
- #################\r
--- 
-1.7.5.1
-