+++ /dev/null
-From 8b6e06bccbf4d405dfec6bd74fd0109b31768688 Mon Sep 17 00:00:00 2001
-From: Olivier Martin <olivier.martin@arm.com>
-Date: Thu, 22 Sep 2011 20:40:01 +0100
-Subject: [PATCH 1/3] BaseTools/tools_def.template: Use GCC_ALL_CC_FLAGS for
- ARMGCC and Clean up flags
-
----
- BaseTools/Conf/tools_def.template | 32 +++++++++++++++++---------------
- 1 files changed, 17 insertions(+), 15 deletions(-)
- mode change 100644 => 100755 BaseTools/Conf/tools_def.template
-
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-old mode 100644
-new mode 100755
-index fe7900e..4dffd21
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -1976,6 +1976,7 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing -
- DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe\r
- DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe\r
- DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency\r
-+DEFINE GCC_ARMGCC_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer\r
- DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie\r
- DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections\r
- DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)\r
-@@ -4075,7 +4076,8 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
- \r
- ####################################################################################\r
- #\r
--# ARM GCC (www.codesourcery.com)\r
-+#\r
-+# ARM EABI GCC (www.codesourcery.com)\r
- #\r
- ####################################################################################\r
- # ARMGCC - ARM version of the GCC cross compiler\r
-@@ -4089,12 +4091,12 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
- ##################\r
- # ASL definitions\r
- ##################\r
--*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
--*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
--*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
--*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P\r
--*_ARMGCC_*_ASLCC_FLAGS = -x c\r
--*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
-+*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
-+*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
-+*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
-+*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P\r
-+*_ARMGCC_*_ASLCC_FLAGS = -x c\r
-+*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
- \r
- ##################\r
- # ARM definitions\r
-@@ -4114,22 +4116,22 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
- #\r
- # Use default values, or override in DSC file\r
- #\r
--*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb\r
--*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a\r
-+*_ARMGCC_ARM_ARCHCC_FLAGS = -mthumb\r
-+*_ARMGCC_ARM_ARCHASM_FLAGS = \r
- *_ARMGCC_ARM_ARCHDLINK_FLAGS =\r
- *_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a\r
- \r
-- DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian -g\r
--RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian\r
-+ DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g\r
-+RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian\r
- \r
--*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
--*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-+*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
- \r
- *_ARMGCC_ARM_SLINK_FLAGS = -rc\r
- *_ARMGCC_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_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g -O0 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
--RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -Os -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
-+ 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
- # ASM 16 linker defintions\r
---
-1.7.5.1
-
+++ /dev/null
-From c6145f7d18b59722beeed14a1b0a97dcad8456f0 Mon Sep 17 00:00:00 2001
-From: Olivier Martin <olivier.martin@arm.com>
-Date: Thu, 22 Sep 2011 20:43:54 +0100
-Subject: [PATCH 2/3] BaseTools/tools_def.template: Replace RVCT31
- toolchains by Generic RVCT toolchains
-
-This generic 'RVCT' toolchain is compatible with RVCT 3.1, 4.0, 4.1 and 5.0.
----
- BaseTools/Conf/tools_def.template | 157 ++++++++++++++++++++++++-------------
- 1 files changed, 101 insertions(+), 56 deletions(-)
-
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 4dffd21..049f29b 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -161,8 +161,6 @@ DEFINE ICC_WIN_ASLCC_FLAGS = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcp
- DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
- \r
- DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Developer\r
--DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
--DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
- \r
- DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
- \r
-@@ -3986,97 +3984,144 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
- \r
- \r
- ####################################################################################\r
-+# RVCT Common\r
-+####################################################################################\r
-+\r
-+DEFINE RVCT_ALL_CC_FLAGS = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide\r
-+\r
-+\r
-+####################################################################################\r
- #\r
--# ARM Tools\r
-+# ARM RealView Tools - Windows\r
- #\r
- ####################################################################################\r
--# RVCT31 - Tools from ARM\r
-+# RVCT - Tools from ARM\r
- \r
--*_RVCT31_*_*_FAMILY = RVCT\r
-+*_RVCT_*_*_FAMILY = RVCT\r
- \r
- #\r
- # Use default values, or override in DSC file\r
- #\r
--*_RVCT31_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A\r
--*_RVCT31_ARM_ARCHASM_FLAGS = --cpu 7-A\r
--*_RVCT31_ARM_ARCHDLINK_FLAGS =\r
--*_RVCT31_ARM_PLATFORM_FLAGS =\r
-+*_RVCT_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCT_ARM_ARCHASM_FLAGS = \r
-+*_RVCT_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A\r
-+\r
-+ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
-+RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
-+\r
-+\r
-+*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r
-+*_RVCT_ARM_SLINK_FLAGS = --partial -o\r
-+ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
-+\r
-+##################\r
-+# ARM definitions\r
-+##################\r
-+*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
-+\r
-+####################################################################################\r
-+#\r
-+# ARM RealView Tools - Linux\r
-+#\r
-+####################################################################################\r
-+# RVCTLINUX - Tools from ARM in a Cygwin environment\r
- \r
-- DEBUG_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide\r
--RELEASE_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide\r
-+*_RVCTLINUX_*_*_FAMILY = RVCT\r
-+*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r
- \r
-+#\r
-+# Use default values, or override in DSC file\r
-+#\r
-+*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCTLINUX_ARM_ARCHASM_FLAGS = \r
-+*_RVCTLINUX_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A\r
- \r
--*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide\r
--*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide\r
--*_RVCT31_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
--*_RVCT31_ARM_MAKE_PATH = nmake\r
--*_RVCT31_ARM_SLINK_FLAGS = --partial --diag_style=ide -o\r
-- DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
--RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
-+RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-+\r
-+*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_RVCTLINUX_ARM_MAKE_PATH = make\r
-+*_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o\r
-+ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
- \r
- ##################\r
- # ARM definitions\r
- ##################\r
--*_RVCT31_ARM_CC_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_SLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink\r
--*_RVCT31_ARM_DLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink\r
--*_RVCT31_ARM_ASM_PATH = DEF(RVCT31_TOOLS_PATH)/armasm\r
--*_RVCT31_ARM_PP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_VFRPP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_FROMELF_PATH = DEF(RVCT31_TOOLS_PATH)/fromelf\r
-+*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
- \r
- ####################################################################################\r
- #\r
--# ARM Tools & Cygwin\r
-+# ARM RealView Tools - Cygwin\r
- #\r
- ####################################################################################\r
- # ARMCYGWIN - Tools from ARM in a Cygwin environment\r
- \r
--*_RVCT31CYGWIN_*_*_FAMILY = RVCT\r
--*_RVCT31CYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
-+*_RVCTCYGWIN_*_*_FAMILY = RVCT\r
-+*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
- \r
--*_RVCT31CYGWIN_ARM_CCPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_SLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
--*_RVCT31CYGWIN_ARM_DLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
--*_RVCT31CYGWIN_ARM_ASMPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armasm\r
--*_RVCT31CYGWIN_ARM_PPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_VFRPPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_FROMELFPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/fromelf\r
-+*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r
- \r
- \r
- #\r
- # Use default values, or override in DSC file\r
- #\r
--*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A\r
--*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS = --cpu 7-A\r
--*_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS =\r
--*_RVCT31CYGWIN_ARM_PLATFORM_FLAGS =\r
-+*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =\r
-+*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A\r
- \r
-- DEBUG_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide\r
--RELEASE_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide\r
-+ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
-+RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
- \r
--*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide\r
--*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide\r
--*_RVCT31CYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
--*_RVCT31CYGWIN_ARM_MAKE_PATH = make\r
--*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial --diag_style=ide -o\r
-- DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
--RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
-+*_RVCTCYGWIN_ARM_MAKE_PATH = make\r
-+*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r
-+ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
- \r
- ##################\r
- # ARM definitions\r
- ##################\r
--*_RVCT31CYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
- \r
- ####################################################################################\r
- #\r
--#\r
- # ARM EABI GCC (www.codesourcery.com)\r
- #\r
- ####################################################################################\r
---
-1.7.5.1
-
+++ /dev/null
-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
-
+++ /dev/null
-diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-old mode 100644
-new mode 100755
-index 189dc43..af47709
---- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-@@ -505,6 +505,7 @@ Returns:
- \r
- EFI_STATUS\r
- AddPadFile (\r
-+ IN FV_INFO *FvInfo,\r
- IN OUT MEMORY_FILE *FvImage,\r
- IN UINT32 DataAlignment,\r
- IN VOID *FvEnd,\r
-@@ -536,6 +537,8 @@ Returns:
- {\r
- EFI_FFS_FILE_HEADER *PadFile;\r
- UINTN PadFileSize;\r
-+ UINTN PadFileOffset;\r
-+ UINTN ExtHeaderSize;\r
- \r
- //\r
- // Verify input parameters.\r
-@@ -558,32 +561,29 @@ Returns:
- // This is the earliest possible valid offset (current plus pad file header\r
- // plus the next file header)\r
- //\r
-- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);\r
-+ // The padding is added into its own FFS file (which requires a header) added before the aligned file:\r
-+ // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData\r
- \r
- //\r
-- // Add whatever it takes to get to the next aligned address\r
-+ // Calculate the Offset of the Pad File from the beginning of the FV file\r
- //\r
-- while ((PadFileSize % DataAlignment) != 0) {\r
-- PadFileSize++;\r
-- }\r
-- //\r
-- // Subtract the next file header size\r
-- //\r
-- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
--\r
-- //\r
-- // Subtract the starting offset to get size\r
-- //\r
-- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
-+ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
- \r
- //\r
-- // Append extension header size\r
-+ // Get the size of the extension header if exists\r
- //\r
- if (ExtHeader != NULL) {\r
-- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;\r
-+ ExtHeaderSize = ExtHeader->ExtHeaderSize;\r
-+ } else {\r
-+ ExtHeaderSize = 0;\r
- }\r
- \r
- //\r
-+ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file\r
-+ //\r
-+ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));\r
-+\r
-+ //\r
- // Verify that we have enough space for the file header\r
- //\r
- if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
-@@ -1110,7 +1110,7 @@ Returns:
- //\r
- // Add pad file if necessary\r
- //\r
-- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
-+ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
- if (EFI_ERROR (Status)) {\r
- Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
- free (FileBuffer);\r
-@@ -2295,7 +2295,7 @@ Returns:
- //\r
- // Add FV Extended Header contents to the FV as a PAD file\r
- //\r
-- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
-+ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
- \r
- //\r
- // Fv Extension header change update Fv Header Check sum\r
+++ /dev/null
-From 5552b8d1c885b1215cec72b8e21b5816a4511737 Mon Sep 17 00:00:00 2001
-From: Olivier Martin <olivier.martin@arm.com>
-Date: Wed, 8 Jun 2011 19:30:49 +0100
-Subject: [PATCH] Fix GenFv for FV files located at 0x0
-
-Fix GenFv for FV file rebased at 0x0 by using the more appropriate attribute 'BaseAddressSet' already defined in the FV_INFO structure.
----
- BaseTools/Source/C/GenFv/GenFv.c | 2 +-
- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
- mode change 100644 => 100755 BaseTools/Source/C/GenFv/GenFv.c
-
-diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
-old mode 100644
-new mode 100755
-index 2cb8771..4662461
---- a/BaseTools/Source/C/GenFv/GenFv.c
-+++ b/BaseTools/Source/C/GenFv/GenFv.c
-@@ -598,7 +598,7 @@ Returns:
- );\r
- } else {\r
- VerboseMsg ("Create Fv image and its map file");\r
-- if (mFvDataInfo.BaseAddress != 0) {\r
-+ if (mFvDataInfo.BaseAddressSet) {\r
- VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
- }\r
- //\r
-diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-index 189dc43..985e4d8 100644
---- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-@@ -209,6 +209,7 @@ Returns:
- DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);\r
- \r
- FvInfo->BaseAddress = Value64;\r
-+ FvInfo->BaseAddressSet = TRUE;\r
- }\r
- }\r
- \r
-@@ -2820,7 +2821,7 @@ Returns:
- //\r
- // Don't need to relocate image when BaseAddress is not set.\r
- //\r
-- if (FvInfo->BaseAddress == 0) {\r
-+ if (FvInfo->BaseAddressSet == FALSE) {\r
- return EFI_SUCCESS;\r
- }\r
- XipBase = FvInfo->BaseAddress + XipOffset;\r
---
-1.6.3.3
-
-From bda353ccfef6e63726352ab2bb15bea4798ea89b Mon Sep 17 00:00:00 2001
-From: Olivier Martin <olivier.martin@arm.com>
-Date: Thu, 22 Sep 2011 20:40:01 +0100
-Subject: [PATCH] BaseTools/Conf: Contain all the changes added by the pending
- patches
-
----
- BaseTools/Conf/build_rule.template | 12 +-
- BaseTools/Conf/tools_def.template | 245 +++++++++++++++++++--------
- BaseTools/Source/C/GenFv/GenFv.c | 2 +-
- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 39 +++--
- 4 files changed, 202 insertions(+), 96 deletions(-)
- mode change 100644 => 100755 BaseTools/Conf/build_rule.template
- mode change 100644 => 100755 BaseTools/Conf/tools_def.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
+Index: BaseTools/Conf/build_rule.template
+===================================================================
+--- BaseTools/Conf/build_rule.template (revision 12664)
++++ BaseTools/Conf/build_rule.template (working copy)
@@ -129,7 +129,7 @@
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\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
-old mode 100644
-new mode 100755
-index fe7900e..20c0033
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -161,8 +161,6 @@ DEFINE ICC_WIN_ASLCC_FLAGS = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcp
- DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
- \r
- DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Developer\r
--DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
--DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
- \r
- DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
- \r
-@@ -1976,6 +1974,7 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing -
- DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe\r
- DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe\r
- DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency\r
-+DEFINE GCC_ARMGCC_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer\r
- DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie\r
- DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections\r
- DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)\r
-@@ -3985,97 +3984,145 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
- \r
- \r
+Index: BaseTools/Conf/tools_def.template
+===================================================================
+--- BaseTools/Conf/tools_def.template (revision 12664)
++++ BaseTools/Conf/tools_def.template (working copy)
+@@ -467,6 +467,7 @@
+ # MSFT - Microsoft\r
+ # GCC - GNU GCC\r
+ # INTEL - INTEL\r
++# RVCT - ARM RealView Toolchain\r
####################################################################################\r
-+# RVCT Common\r
-+####################################################################################\r
-+\r
-+DEFINE RVCT_ALL_CC_FLAGS = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide\r
-+\r
-+\r
-+####################################################################################\r
- #\r
--# ARM Tools\r
-+# ARM RealView Tools - Windows\r
- #\r
####################################################################################\r
--# RVCT31 - Tools from ARM\r
-+# RVCT - Tools from ARM\r
- \r
--*_RVCT31_*_*_FAMILY = RVCT\r
-+*_RVCT_*_*_FAMILY = RVCT\r
- \r
#\r
- # Use default values, or override in DSC file\r
- #\r
--*_RVCT31_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A\r
--*_RVCT31_ARM_ARCHASM_FLAGS = --cpu 7-A\r
--*_RVCT31_ARM_ARCHDLINK_FLAGS =\r
--*_RVCT31_ARM_PLATFORM_FLAGS =\r
-+*_RVCT_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCT_ARM_ARCHASM_FLAGS = \r
-+*_RVCT_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A\r
- \r
-- DEBUG_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide\r
--RELEASE_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide\r
-+ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
-+RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
- \r
- \r
--*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide\r
--*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide\r
--*_RVCT31_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
--*_RVCT31_ARM_MAKE_PATH = nmake\r
--*_RVCT31_ARM_SLINK_FLAGS = --partial --diag_style=ide -o\r
-- DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
--RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r
-+*_RVCT_ARM_SLINK_FLAGS = --partial -o\r
-+ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
- \r
- ##################\r
- # ARM definitions\r
- ##################\r
--*_RVCT31_ARM_CC_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_SLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink\r
--*_RVCT31_ARM_DLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink\r
--*_RVCT31_ARM_ASM_PATH = DEF(RVCT31_TOOLS_PATH)/armasm\r
--*_RVCT31_ARM_PP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_VFRPP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc\r
--*_RVCT31_ARM_FROMELF_PATH = DEF(RVCT31_TOOLS_PATH)/fromelf\r
-+*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
- \r
- ####################################################################################\r
- #\r
--# ARM Tools & Cygwin\r
-+# ARM RealView Tools - Linux\r
-+#\r
-+####################################################################################\r
-+# RVCTLINUX - Tools from ARM in a Cygwin environment\r
-+\r
-+*_RVCTLINUX_*_*_FAMILY = RVCT\r
-+*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r
-+\r
-+#\r
-+# Use default values, or override in DSC file\r
-+#\r
-+*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCTLINUX_ARM_ARCHASM_FLAGS = \r
-+*_RVCTLINUX_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A\r
-+\r
-+DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
-+RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-+\r
-+*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_RVCTLINUX_ARM_MAKE_PATH = make\r
-+*_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o\r
-+ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
-+\r
-+##################\r
-+# ARM definitions\r
-+##################\r
-+*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
-+\r
-+####################################################################################\r
-+#\r
-+# ARM RealView Tools - Cygwin\r
- #\r
- ####################################################################################\r
- # ARMCYGWIN - Tools from ARM in a Cygwin environment\r
- \r
--*_RVCT31CYGWIN_*_*_FAMILY = RVCT\r
--*_RVCT31CYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
-+*_RVCTCYGWIN_*_*_FAMILY = RVCT\r
-+*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
- \r
--*_RVCT31CYGWIN_ARM_CCPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_SLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
--*_RVCT31CYGWIN_ARM_DLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
--*_RVCT31CYGWIN_ARM_ASMPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armasm\r
--*_RVCT31CYGWIN_ARM_PPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_VFRPPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
--*_RVCT31CYGWIN_ARM_FROMELFPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/fromelf\r
-+*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-+*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r
-+*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-+*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r
- \r
- \r
- #\r
- # Use default values, or override in DSC file\r
- #\r
--*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A\r
--*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS = --cpu 7-A\r
--*_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS =\r
--*_RVCT31CYGWIN_ARM_PLATFORM_FLAGS =\r
-+*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb\r
-+*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =\r
-+*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = \r
-+*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A\r
- \r
-- DEBUG_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide\r
--RELEASE_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide\r
-+ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
-+RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
- \r
--*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide\r
--*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide\r
--*_RVCT31CYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
--*_RVCT31CYGWIN_ARM_MAKE_PATH = make\r
--*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial --diag_style=ide -o\r
-- DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
--RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide\r
-+*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork\r
-+*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-+*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
-+*_RVCTCYGWIN_ARM_MAKE_PATH = make\r
-+*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r
-+ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-+RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2\r
- \r
- ##################\r
- # ARM definitions\r
- ##################\r
--*_RVCT31CYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
--*_RVCT31CYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-+*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
- \r
- ####################################################################################\r
- #\r
--# ARM GCC (www.codesourcery.com)\r
-+# ARM EABI GCC (www.codesourcery.com)\r
- #\r
- ####################################################################################\r
- # ARMGCC - ARM version of the GCC cross compiler\r
-@@ -4089,12 +4136,12 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
- ##################\r
- # ASL definitions\r
- ##################\r
--*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
--*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
--*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
--*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P\r
--*_ARMGCC_*_ASLCC_FLAGS = -x c\r
--*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
-+*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
-+*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
-+*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
-+*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P\r
-+*_ARMGCC_*_ASLCC_FLAGS = -x c\r
-+*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
- \r
- ##################\r
- # ARM definitions\r
-@@ -4114,22 +4161,80 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
- #\r
- # Use default values, or override in DSC file\r
- #\r
--*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb\r
--*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a\r
-+*_ARMGCC_ARM_ARCHCC_FLAGS = -mthumb\r
-+*_ARMGCC_ARM_ARCHASM_FLAGS = \r
- *_ARMGCC_ARM_ARCHDLINK_FLAGS =\r
- *_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a\r
- \r
-- DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian -g\r
--RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian\r
-+ DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g\r
-+RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian\r
- \r
--*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
--*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-+*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+@@ -4173,11 +4174,69 @@
+ *_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
\r
*_ARMGCC_ARM_SLINK_FLAGS = -rc\r
- *_ARMGCC_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
+-*_ARMGCC_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
++*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+ \r
+ 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
-- DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g -O0 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
--RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -Os -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
-+ 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
+*_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
++*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --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
#################\r
# ASM 16 linker defintions\r
-diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
-index 8f452c7..a095220 100644
---- a/BaseTools/Source/C/GenFv/GenFv.c
-+++ b/BaseTools/Source/C/GenFv/GenFv.c
-@@ -597,7 +597,7 @@ Returns:
+ #################\r
+Index: BaseTools/Source/Python/Workspace/MetaFileParser.py
+===================================================================
+--- BaseTools/Source/Python/Workspace/MetaFileParser.py (revision 12664)
++++ BaseTools/Source/Python/Workspace/MetaFileParser.py (working copy)
+@@ -1280,6 +1280,9 @@
+ Records = IncludedFileTable.GetAll()
+ if Records:
+ self._Content[self._ContentIndex:self._ContentIndex] = Records
++ self._Content.pop(self._ContentIndex-1)
++ self._ValueList = None
++ self._ContentIndex -= 1
+
+ def __ProcessSkuId(self):
+ self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)
+Index: BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+===================================================================
+--- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (revision 12664)
++++ BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (working copy)
+@@ -2319,7 +2319,7 @@
+ # @param GlobalMacros Global macros used for replacement during file parsing\r
+ # @prarm RenewDb=False Create new database file if it's already there\r
+ #\r
+- def __init__(self, DbPath, RenewDb=False):\r
++ def __init__(self, DbPath, RenewDb=False, DbSignature={}):\r
+ self._DbClosedFlag = False\r
+ if not DbPath:\r
+ DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, self._DB_PATH_))\r
+@@ -2331,7 +2331,7 @@
+ os.makedirs(DbDir)\r
+ \r
+ # remove db file in case inconsistency between db and file in file system\r
+- if self._CheckWhetherDbNeedRenew(RenewDb, DbPath):\r
++ if self._CheckWhetherDbNeedRenew(RenewDb, DbPath, DbSignature):\r
+ os.remove(DbPath)\r
+ \r
+ # create db with optimized parameters\r
+@@ -2367,7 +2367,38 @@
+ #\r
+ # @return Bool value for whether need renew workspace databse\r
+ #\r
+- def _CheckWhetherDbNeedRenew (self, force, DbPath):\r
++ def _CheckWhetherDbNeedRenew (self, force, DbPath, DbSignature):\r
++ DbDir = os.path.split(DbPath)[0]\r
++ MacroFilePath = os.path.normpath(os.path.join(DbDir, "build.mac"))\r
++ MacroMatch = False\r
++ if os.path.exists(MacroFilePath) and os.path.isfile(MacroFilePath):\r
++ LastMacros = None\r
++ try:\r
++ f = open(MacroFilePath,'r')\r
++ LastMacros = pickle.load(f)\r
++ f.close()\r
++ except IOError:\r
++ pass\r
++ except:\r
++ f.close()\r
++\r
++ if LastMacros != None and type(LastMacros) is DictType:\r
++ if LastMacros == DbSignature:\r
++ MacroMatch = True\r
++\r
++ if not MacroMatch:\r
++ # save command line macros to file\r
++ try:\r
++ f = open(MacroFilePath,'w')\r
++ pickle.dump(DbSignature, f, 2)\r
++ f.close()\r
++ except IOError:\r
++ pass\r
++ except:\r
++ f.close()\r
++\r
++ force = True\r
++\r
+ # if database does not exist, we need do nothing\r
+ if not os.path.exists(DbPath): return False\r
+ \r
+Index: BaseTools/Source/Python/build/build.py
+===================================================================
+--- BaseTools/Source/Python/build/build.py (revision 12664)
++++ BaseTools/Source/Python/build/build.py (working copy)
+@@ -704,6 +704,8 @@
+ #\r
+ def __init__(self, Target, WorkspaceDir, BuildOptions):\r
+ self.WorkspaceDir = WorkspaceDir\r
++ DbSignature = {'Target': Target, 'BuildOptions': BuildOptions }\r
++ \r
+ self.Target = Target\r
+ self.PlatformFile = BuildOptions.PlatformFile\r
+ self.ModuleFile = BuildOptions.ModuleFile\r
+@@ -726,7 +728,7 @@
+ if BuildOptions.DisableCache:\r
+ self.Db = WorkspaceDatabase(":memory:")\r
+ else:\r
+- self.Db = WorkspaceDatabase(None, self.Reparse)\r
++ self.Db = WorkspaceDatabase(None, self.Reparse, DbSignature)\r
+ self.BuildDatabase = self.Db.BuildObject\r
+ self.Platform = None\r
+ self.LoadFixAddress = 0\r
+Index: BaseTools/Source/C/GenFv/GenFv.c
+===================================================================
+--- BaseTools/Source/C/GenFv/GenFv.c (revision 12664)
++++ BaseTools/Source/C/GenFv/GenFv.c (working copy)
+@@ -623,12 +623,7 @@
);\r
} else {\r
VerboseMsg ("Create Fv image and its map file");\r
-- if (mFvDataInfo.BaseAddress != 0) {\r
+- //\r
+- // Will take rebase action at below situation:\r
+- // 1. ForceRebase Flag specified to TRUE;\r
+- // 2. ForceRebase Flag not specified, BaseAddress greater than zero.\r
+- //\r
+- if (((mFvDataInfo.BaseAddress > 0) && (mFvDataInfo.ForceRebase == -1)) || (mFvDataInfo.ForceRebase == 1)) {\r
+ if (mFvDataInfo.BaseAddressSet) {\r
VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
}\r
//\r
-diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-index d86909b..5aa1a08 100644
---- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
-@@ -209,6 +209,7 @@ Returns:
- DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);\r
- \r
- FvInfo->BaseAddress = Value64;\r
-+ FvInfo->BaseAddressSet = TRUE;\r
- }\r
- }\r
- \r
-@@ -505,6 +506,7 @@ Returns:
+Index: BaseTools/Source/C/GenFv/GenFvInternalLib.c
+===================================================================
+--- BaseTools/Source/C/GenFv/GenFvInternalLib.c (revision 12664)
++++ BaseTools/Source/C/GenFv/GenFvInternalLib.c (working copy)
+@@ -506,6 +506,7 @@
\r
EFI_STATUS\r
AddPadFile (\r
IN OUT MEMORY_FILE *FvImage,\r
IN UINT32 DataAlignment,\r
IN VOID *FvEnd,\r
-@@ -536,6 +538,8 @@ Returns:
+@@ -537,6 +538,8 @@
{\r
EFI_FFS_FILE_HEADER *PadFile;\r
UINTN PadFileSize;\r
\r
//\r
// Verify input parameters.\r
-@@ -558,32 +562,29 @@ Returns:
+@@ -559,32 +562,29 @@
// This is the earliest possible valid offset (current plus pad file header\r
// plus the next file header)\r
//\r
// Verify that we have enough space for the file header\r
//\r
if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
-@@ -1114,7 +1115,7 @@ Returns:
+@@ -1115,7 +1115,7 @@
//\r
// Add pad file if necessary\r
//\r
if (EFI_ERROR (Status)) {\r
Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
free (FileBuffer);\r
-@@ -2303,7 +2304,7 @@ Returns:
+@@ -2304,7 +2304,7 @@
//\r
// Add FV Extended Header contents to the FV as a PAD file\r
//\r
\r
//\r
// Fv Extension header change update Fv Header Check sum\r
-@@ -2828,7 +2829,7 @@ Returns:
+@@ -2825,20 +2825,12 @@
+ PeFileBuffer = NULL;\r
+ \r
//\r
- // Don't need to relocate image when BaseAddress is not set.\r
+- // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.\r
++ // Don't need to relocate image when BaseAddress is not set.\r
//\r
-- if (FvInfo->BaseAddress == 0) {\r
+- if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {\r
+ if (FvInfo->BaseAddressSet == FALSE) {\r
return EFI_SUCCESS;\r
}\r
+- \r
+- //\r
+- // If ForceRebase Flag specified to FALSE, will always not take rebase action.\r
+- //\r
+- if (FvInfo->ForceRebase == 0) {\r
+- return EFI_SUCCESS;\r
+- }\r
+ \r
+-\r
XipBase = FvInfo->BaseAddress + XipOffset;\r
---
-1.7.5.1
-
+ \r
+ //\r
projects / mirror_edk2.git / commitdiff