ArmPlatformPkg/Documentation/patches/BaseTools-Pending-Patches.patch

   1 diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
   2 index 528bdb9..c201d3e 100644
   3 --- a/BaseTools/Conf/build_rule.template
   4 +++ b/BaseTools/Conf/build_rule.template
   5 @@ -242,7 +242,7 @@
   6          "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
   7
   8      <Command.ARMGCC>
   9 -        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -) $(DLINK2_FLAGS)
  10 +        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)
  11
  12      <Command.RVCT>
  13          "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
  14 @@ -272,7 +272,7 @@
  15          "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)
  16
  17      <Command.ARMGCC>
  18 -        "$(DLINK)" $(DLINK_FLAGS) -( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -) $(DLINK2_FLAGS)
  19 +        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)
  20
  21      <Command.RVCT>
  22          "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
  23 @@ -425,7 +425,7 @@
  24        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
  25        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
  26        "$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
  27 -      "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj -)
  28 +      "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj -\)
  29
  30      <Command.XCODE>
  31        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
  32 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
  33 old mode 100644
  34 new mode 100755
  35 index 495f55d..09af677
  36 --- a/BaseTools/Conf/tools_def.template
  37 +++ b/BaseTools/Conf/tools_def.template
  38 @@ -164,8 +164,6 @@ DEFINE IPHONE_TOOLS            = /Developer/Platforms/iPhoneOS.platform/Develope
  39  DEFINE RVCT31_TOOLS_PATH       = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
  40  DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
  41
  42 -DEFINE SOURCERY_TOOLS        = c:/Program Files/CodeSourcery/Sourcery G++ Lite/bin
  43 -DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
  44
  45  #
  46  # Change to the location clang was built
  47 @@ -3031,6 +3029,45 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL
  48  *_ICC11x86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
  49  *_ICC11x86_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP
  50
  51 +####################################################################################
  52 +#
  53 +# ARM RealView 4.0 Tools & Linux
  54 +#
  55 +####################################################################################
  56 +#   ARMCYGWIN         - Tools from ARM in a Cygwin environment
  57 +
  58 +*_RVCTLINUX_*_*_FAMILY               = RVCT
  59 +*_RVCTLINUX_*_*_BUILDRULEFAMILY      = RVCTLINUX
  60 +
  61 +#
  62 +# Use default values, or override in DSC file
  63 +#
  64 +*_RVCTLINUX_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
  65 +*_RVCTLINUX_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
  66 +*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
  67 +*_RVCTLINUX_ARM_PLATFORM_FLAGS  =
  68 +
  69 +DEBUG_RVCTLINUX_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 $(DEST_DIR_DEBUG)/$(BASE_NAME).map
  70 +RELEASE_RVCTLINUX_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 $(DEST_DIR_DEBUG)/$(BASE_NAME).map
  71 +
  72 +*_RVCTLINUX_ARM_ASM_FLAGS       = $(ASMPATH_FLAG) $(ARCHASM_FLAGS) --apcs /interwork
  73 +*_RVCTLINUX_ARM_PP_FLAGS        = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
  74 +*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
  75 +*_RVCTLINUX_ARM_MAKE_PATH       = make
  76 +*_RVCTLINUX_ARM_SLINK_FLAGS     = $(SLINKPATH_FLAG) --partial -o
  77 +  DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1     --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
  78 +RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
  79 +
  80 +##################
  81 +# ARM definitions
  82 +##################
  83 +*_RVCTLINUX_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
  84 +*_RVCTLINUX_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
  85 +*_RVCTLINUX_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
  86 +*_RVCTLINUX_ARM_ASM_PATH        = ENV(RVCT_TOOLS_PATH)armasm
  87 +*_RVCTLINUX_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
  88 +*_RVCTLINUX_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
  89 +*_RVCTLINUX_ARM_FROMELF_PATH    = ENV(RVCT_TOOLS_PATH)fromelf
  90
  91  ####################################################################################
  92  #
  93 @@ -3463,7 +3500,7 @@ RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os
  94
  95  ####################################################################################
  96  #
  97 -# ARM Tools
  98 +# ARM RealView 3.1 Tools
  99  #
 100  ####################################################################################
 101  #   RVCT31         - Tools from ARM
 102 @@ -3503,7 +3540,7 @@ RELEASE_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90    -Ospac
 103
 104  ####################################################################################
 105  #
 106 -# ARM Tools & Cygwin
 107 +# ARM RealView 3.1 Tools & Cygwin
 108  #
 109  ####################################################################################
 110  #   ARMCYGWIN         - Tools from ARM in a Cygwin environment
 111 @@ -3552,6 +3589,95 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
 112
 113  ####################################################################################
 114  #
 115 +# ARM RealView 4.0 Tools
 116 +#
 117 +####################################################################################
 118 +#   RVCT         - Tools from ARM
 119 +
 120 +*_RVCT_*_*_FAMILY          = RVCT
 121 +
 122 +#
 123 +# Use default values, or override in DSC file
 124 +#
 125 +*_RVCT_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
 126 +*_RVCT_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
 127 +*_RVCT_ARM_ARCHDLINK_FLAGS =
 128 +*_RVCT_ARM_PLATFORM_FLAGS  =
 129 +
 130 +  DEBUG_RVCT_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
 131 +RELEASE_RVCT_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
 132 +
 133 +
 134 +*_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) --apcs /interwork
 135 +*_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 136 +*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 137 +*_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
 138 +*_RVCT_ARM_SLINK_FLAGS     = --partial -o
 139 +  DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1     --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
 140 +RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c    -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
 141 +
 142 +##################
 143 +# ARM definitions
 144 +##################
 145 +*_RVCT_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
 146 +*_RVCT_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
 147 +*_RVCT_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
 148 +*_RVCT_ARM_ASM_PATH        = ENV(RVCT_TOOLS_PATH)armasm
 149 +*_RVCT_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
 150 +*_RVCT_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
 151 +*_RVCT_ARM_FROMELF_PATH    = ENV(RVCT_TOOLS_PATH)fromelf
 152 +
 153 +####################################################################################
 154 +#
 155 +# ARM RealView 4.0 Tools & Cygwin
 156 +#
 157 +####################################################################################
 158 +#   ARMCYGWIN         - Tools from ARM in a Cygwin environment
 159 +
 160 +*_RVCTCYGWIN_*_*_FAMILY               = RVCT
 161 +*_RVCTCYGWIN_*_*_BUILDRULEFAMILY      = RVCTCYGWIN
 162 +
 163 +*_RVCTCYGWIN_ARM_CCPATH_FLAG         = ENV(RVCT_TOOLS_PATH)armcc
 164 +*_RVCTCYGWIN_ARM_SLINKPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armlink
 165 +*_RVCTCYGWIN_ARM_DLINKPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armlink
 166 +*_RVCTCYGWIN_ARM_ASMPATH_FLAG        = ENV(RVCT_TOOLS_PATH)armasm
 167 +*_RVCTCYGWIN_ARM_PPPATH_FLAG         = ENV(RVCT_TOOLS_PATH)armcc
 168 +*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armcc
 169 +*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG    = ENV(RVCT_TOOLS_PATH)fromelf
 170 +
 171 +
 172 +#
 173 +# Use default values, or override in DSC file
 174 +#
 175 +*_RVCTCYGWIN_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
 176 +*_RVCTCYGWIN_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
 177 +*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
 178 +*_RVCTCYGWIN_ARM_PLATFORM_FLAGS  =
 179 +
 180 +  DEBUG_RVCTCYGWIN_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`
 181 +RELEASE_RVCTCYGWIN_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`
 182 +
 183 +*_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork
 184 +*_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 185 +*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
 186 +*_RVCTCYGWIN_ARM_MAKE_PATH       = make
 187 +*_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
 188 +  DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1     --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
 189 +RELEASE_RVCTCYGWIN_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 --enum_is_int --preinclude AutoGen.h --diag_warning 167
 190 +
 191 +##################
 192 +# ARM definitions
 193 +##################
 194 +*_RVCTCYGWIN_ARM_CC_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 195 +*_RVCTCYGWIN_ARM_SLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 196 +*_RVCTCYGWIN_ARM_DLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 197 +*_RVCTCYGWIN_ARM_ASM_PATH        = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 198 +*_RVCTCYGWIN_ARM_PP_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 199 +*_RVCTCYGWIN_ARM_VFRPP_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 200 +*_RVCTCYGWIN_ARM_FROMELF_PATH    = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 201 +
 202 +####################################################################################
 203 +#
 204  # ARM GCC (www.codesourcery.com)
 205  #
 206  ####################################################################################
 207 @@ -3560,7 +3686,7 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
 208  *_ARMGCC_*_*_FAMILY          = GCC
 209  *_ARMGCC_*_*_BUILDRULEFAMILY = ARMGCC
 210
 211 -*_ARMGCC_*_MAKE_PATH         = DEF(SOURCERY_TOOLS)/cs-make
 212 +*_ARMGCC_*_MAKE_PATH         = make
 213  *_ARMGCC_*_MAKE_FLAGS        = --no-print-directory
 214
 215  ##################
 216 @@ -3577,22 +3703,22 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
 217  # ARM definitions
 218  ##################
 219
 220 -*_ARMGCC_ARM_ASLCC_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 221 -*_ARMGCC_ARM_ASLDLINK_PATH   = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
 222 -*_ARMGCC_ARM_ASLPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 223 +*_ARMGCC_ARM_ASLCC_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 224 +*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
 225 +*_ARMGCC_ARM_ASLPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 226
 227 -*_ARMGCC_ARM_CC_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 228 -*_ARMGCC_ARM_SLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ar
 229 -*_ARMGCC_ARM_DLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
 230 -*_ARMGCC_ARM_ASM_PATH        = DEF(SOURCERY_TOOLS)/arm-none-eabi-as
 231 -*_ARMGCC_ARM_PP_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 232 -*_ARMGCC_ARM_VFRPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 233 +*_ARMGCC_ARM_CC_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 234 +*_ARMGCC_ARM_SLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar
 235 +*_ARMGCC_ARM_DLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
 236 +*_ARMGCC_ARM_ASM_PATH        = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as
 237 +*_ARMGCC_ARM_PP_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 238 +*_ARMGCC_ARM_VFRPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 239
 240  #
 241  # Use default values, or override in DSC file
 242  #
 243 -*_ARMGCC_ARM_ARCHCC_FLAGS    = -march=armv7-a -mthumb
 244 -*_ARMGCC_ARM_ARCHASM_FLAGS   = -march=armv7-a
 245 +*_ARMGCC_ARM_ARCHCC_FLAGS    = -march=armv7-a -mthumb -mthumb-interwork
 246 +*_ARMGCC_ARM_ARCHASM_FLAGS   = -march=armv7-a -mthumb-interwork
 247  *_ARMGCC_ARM_ARCHDLINK_FLAGS =
 248  *_ARMGCC_ARM_PLATFORM_FLAGS  = -march=armv7-a
 249
 250 @@ -3603,10 +3729,10 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) -mlittle-endian
 251  *_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)  -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 252
 253  *_ARMGCC_ARM_SLINK_FLAGS =  -rc
 254 -*_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
 255 +*_ARMGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS)  --oformat=elf32-littlearm -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 256
 257 -  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
 258 -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
 259 +  DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mword-relocations -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
 260 +RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mword-relocations -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
 261
 262  #################
 263  # ASM 16 linker defintions
 264 diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
 265 index 2cb8771..4662461 100644
 266 --- a/BaseTools/Source/C/GenFv/GenFv.c
 267 +++ b/BaseTools/Source/C/GenFv/GenFv.c
 268 @@ -598,7 +598,7 @@ Returns:
 269                );
 270    } else {
 271      VerboseMsg ("Create Fv image and its map file");
 272 -    if (mFvDataInfo.BaseAddress != 0) {
 273 +    if (mFvDataInfo.BaseAddressSet) {
 274        VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);
 275      }
 276      //
 277 diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
 278 old mode 100644
 279 new mode 100755
 280 index 189dc43..496b96c
 281 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
 282 +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
 283 @@ -209,6 +209,7 @@ Returns:
 284        DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);
 285
 286        FvInfo->BaseAddress = Value64;
 287 +      FvInfo->BaseAddressSet = TRUE;
 288      }
 289    }
 290
 291 @@ -505,6 +506,7 @@ Returns:
 292
 293  EFI_STATUS
 294  AddPadFile (
 295 +  IN FV_INFO          *FvInfo,
 296    IN OUT MEMORY_FILE  *FvImage,
 297    IN UINT32           DataAlignment,
 298    IN VOID             *FvEnd,
 299 @@ -536,6 +538,8 @@ Returns:
 300  {
 301    EFI_FFS_FILE_HEADER *PadFile;
 302    UINTN               PadFileSize;
 303 +  UINTN               PadFileOffset;
 304 +  UINTN               ExtHeaderSize;
 305
 306    //
 307    // Verify input parameters.
 308 @@ -558,32 +562,29 @@ Returns:
 309    // This is the earliest possible valid offset (current plus pad file header
 310    // plus the next file header)
 311    //
 312 -  PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);
 313 +  // The padding is added into its own FFS file (which requires a header) added before the aligned file:
 314 +  // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData
 315
 316    //
 317 -  // Add whatever it takes to get to the next aligned address
 318 +  // Calculate the Offset of the Pad File from the beginning of the FV file
 319    //
 320 -  while ((PadFileSize % DataAlignment) != 0) {
 321 -    PadFileSize++;
 322 -  }
 323 -  //
 324 -  // Subtract the next file header size
 325 -  //
 326 -  PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);
 327 -
 328 -  //
 329 -  // Subtract the starting offset to get size
 330 -  //
 331 -  PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;
 332 +  PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;
 333
 334    //
 335 -  // Append extension header size
 336 +  // Get the size of the extension header if exists
 337    //
 338    if (ExtHeader != NULL) {
 339 -    PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;
 340 +    ExtHeaderSize = ExtHeader->ExtHeaderSize;
 341 +  } else {
 342 +    ExtHeaderSize = 0;
 343    }
 344
 345    //
 346 +  // Calculate the Size of the Padding to ensure the alignment of the data of the Next file
 347 +  //
 348 +  PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));
 349 +
 350 +  //
 351    // Verify that we have enough space for the file header
 352    //
 353    if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {
 354 @@ -1110,7 +1111,7 @@ Returns:
 355    //
 356    // Add pad file if necessary
 357    //
 358 -  Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);
 359 +  Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);
 360    if (EFI_ERROR (Status)) {
 361      Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");
 362      free (FileBuffer);
 363 @@ -2295,7 +2296,7 @@ Returns:
 364      //
 365      // Add FV Extended Header contents to the FV as a PAD file
 366      //
 367 -    AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);
 368 +    AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);
 369
 370      //
 371      // Fv Extension header change update Fv Header Check sum
 372 @@ -2820,7 +2821,7 @@ Returns:
 373    //
 374    // Don't need to relocate image when BaseAddress is not set.
 375    //
 376 -  if (FvInfo->BaseAddress == 0) {
 377 +  if (FvInfo->BaseAddressSet == FALSE) {
 378      return EFI_SUCCESS;
 379    }
 380    XipBase = FvInfo->BaseAddress + XipOffset;
 381 diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
 382 index e6e8847..6a78d01 100644
 383 --- a/BaseTools/Source/Python/AutoGen/GenC.py
 384 +++ b/BaseTools/Source/Python/AutoGen/GenC.py
 385 @@ -67,11 +67,11 @@ typedef UINT8 SKU_ID;
 386
 387  #define PCD_TYPE_SHIFT        28
 388
 389 -#define PCD_TYPE_DATA         (0x0 << PCD_TYPE_SHIFT)
 390 -#define PCD_TYPE_HII          (0x8 << PCD_TYPE_SHIFT)
 391 -#define PCD_TYPE_VPD          (0x4 << PCD_TYPE_SHIFT)
 392 -#define PCD_TYPE_SKU_ENABLED  (0x2 << PCD_TYPE_SHIFT)
 393 -#define PCD_TYPE_STRING       (0x1 << PCD_TYPE_SHIFT)
 394 +#define PCD_TYPE_DATA         (0x0u << PCD_TYPE_SHIFT)
 395 +#define PCD_TYPE_HII          (0x8u << PCD_TYPE_SHIFT)
 396 +#define PCD_TYPE_VPD          (0x4u << PCD_TYPE_SHIFT)
 397 +#define PCD_TYPE_SKU_ENABLED  (0x2u << PCD_TYPE_SHIFT)
 398 +#define PCD_TYPE_STRING       (0x1u << PCD_TYPE_SHIFT)
 399
 400  #define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
 401