ArmPlatformPkg/Documentation/patches/BaseTools-Add-new-RVCT-RVCTLINUX-toolchains.patch

   1 From 7241330bc45c2e03e8edaf4282f22be204f22d22 Mon Sep 17 00:00:00 2001
   2 From: Olivier Martin <olivier.martin@arm.com>
   3 Date: Fri, 14 Jan 2011 11:53:24 +0000
   4 Subject: [PATCH 33/37] BaseTools: Add new 'RVCT' & 'RVCTLINUX' toolchains
   5
   6 These toolchains use the fix for the ENV() macro. There is no need of hardcoded path.
   7 That will remove the update of tools_def for any single new toolchain build number.
   8 ---
   9  BaseTools/Conf/tools_def.template |  154 +++++++++++++++++++++++++++++++++----
  10  1 files changed, 140 insertions(+), 14 deletions(-)
  11
  12 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
  13 index 0645d6f..f9db7db 100755
  14 --- a/BaseTools/Conf/tools_def.template
  15 +++ b/BaseTools/Conf/tools_def.template
  16 @@ -164,8 +164,6 @@ DEFINE IPHONE_TOOLS            = /Developer/Platforms/iPhoneOS.platform/Develope
  17  DEFINE RVCT31_TOOLS_PATH       = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
  18  DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
  19
  20 -DEFINE SOURCERY_TOOLS        = c:/Program Files/CodeSourcery/Sourcery G++ Lite/bin
  21 -DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
  22
  23  ####################################################################################
  24  #
  25 @@ -3020,6 +3018,45 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL
  26  *_ICC11x86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
  27  *_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
  28
  29 +####################################################################################
  30 +#
  31 +# ARM RealView 4.0 Tools & Linux
  32 +#
  33 +####################################################################################
  34 +#   ARMCYGWIN         - Tools from ARM in a Cygwin environment
  35 +
  36 +*_RVCTLINUX_*_*_FAMILY               = RVCT
  37 +*_RVCTLINUX_*_*_BUILDRULEFAMILY      = RVCTLINUX
  38 +
  39 +#
  40 +# Use default values, or override in DSC file
  41 +#
  42 +*_RVCTLINUX_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
  43 +*_RVCTLINUX_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
  44 +*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
  45 +*_RVCTLINUX_ARM_PLATFORM_FLAGS  =
  46 +
  47 +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
  48 +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
  49 +
  50 +*_RVCTLINUX_ARM_ASM_FLAGS       = $(ASMPATH_FLAG) $(ARCHASM_FLAGS) --apcs /interwork
  51 +*_RVCTLINUX_ARM_PP_FLAGS        = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
  52 +*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
  53 +*_RVCTLINUX_ARM_MAKE_PATH       = make
  54 +*_RVCTLINUX_ARM_SLINK_FLAGS     = $(SLINKPATH_FLAG) --partial -o
  55 +  DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
  56 +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
  57 +
  58 +##################
  59 +# ARM definitions
  60 +##################
  61 +*_RVCTLINUX_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
  62 +*_RVCTLINUX_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
  63 +*_RVCTLINUX_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
  64 +*_RVCTLINUX_ARM_ASM_PATH        = ENV(RVCT_TOOLS_PATH)armasm
  65 +*_RVCTLINUX_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
  66 +*_RVCTLINUX_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
  67 +*_RVCTLINUX_ARM_FROMELF_PATH    = ENV(RVCT_TOOLS_PATH)fromelf
  68
  69  ####################################################################################
  70  #
  71 @@ -3387,7 +3424,7 @@ RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter
  72
  73  ####################################################################################
  74  #
  75 -# ARM Tools
  76 +# ARM RealView 3.1 Tools
  77  #
  78  ####################################################################################
  79  #   RVCT31         - Tools from ARM
  80 @@ -3427,7 +3464,7 @@ RELEASE_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90    -Ospac
  81
  82  ####################################################################################
  83  #
  84 -# ARM Tools & Cygwin
  85 +# ARM RealView 3.1 Tools & Cygwin
  86  #
  87  ####################################################################################
  88  #   ARMCYGWIN         - Tools from ARM in a Cygwin environment
  89 @@ -3476,6 +3513,95 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
  90
  91  ####################################################################################
  92  #
  93 +# ARM RealView 4.0 Tools
  94 +#
  95 +####################################################################################
  96 +#   RVCT         - Tools from ARM
  97 +
  98 +*_RVCT_*_*_FAMILY          = RVCT
  99 +
 100 +#
 101 +# Use default values, or override in DSC file
 102 +#
 103 +*_RVCT_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
 104 +*_RVCT_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
 105 +*_RVCT_ARM_ARCHDLINK_FLAGS =
 106 +*_RVCT_ARM_PLATFORM_FLAGS  =
 107 +
 108 +  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
 109 +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
 110 +
 111 +
 112 +*_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) --apcs /interwork
 113 +*_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 114 +*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 115 +*_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
 116 +*_RVCT_ARM_SLINK_FLAGS     = --partial -o
 117 +  DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
 118 +RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_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
 119 +
 120 +##################
 121 +# ARM definitions
 122 +##################
 123 +*_RVCT_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
 124 +*_RVCT_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
 125 +*_RVCT_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
 126 +*_RVCT_ARM_ASM_PATH        = ENV(RVCT_TOOLS_PATH)armasm
 127 +*_RVCT_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
 128 +*_RVCT_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
 129 +*_RVCT_ARM_FROMELF_PATH    = ENV(RVCT_TOOLS_PATH)fromelf
 130 +
 131 +####################################################################################
 132 +#
 133 +# ARM RealView 4.0 Tools & Cygwin
 134 +#
 135 +####################################################################################
 136 +#   ARMCYGWIN         - Tools from ARM in a Cygwin environment
 137 +
 138 +*_RVCTCYGWIN_*_*_FAMILY               = RVCT
 139 +*_RVCTCYGWIN_*_*_BUILDRULEFAMILY      = RVCTCYGWIN
 140 +
 141 +*_RVCTCYGWIN_ARM_CCPATH_FLAG         = ENV(RVCT_TOOLS_PATH)armcc
 142 +*_RVCTCYGWIN_ARM_SLINKPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armlink
 143 +*_RVCTCYGWIN_ARM_DLINKPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armlink
 144 +*_RVCTCYGWIN_ARM_ASMPATH_FLAG        = ENV(RVCT_TOOLS_PATH)armasm
 145 +*_RVCTCYGWIN_ARM_PPPATH_FLAG         = ENV(RVCT_TOOLS_PATH)armcc
 146 +*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG      = ENV(RVCT_TOOLS_PATH)armcc
 147 +*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG    = ENV(RVCT_TOOLS_PATH)fromelf
 148 +
 149 +
 150 +#
 151 +# Use default values, or override in DSC file
 152 +#
 153 +*_RVCTCYGWIN_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
 154 +*_RVCTCYGWIN_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
 155 +*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
 156 +*_RVCTCYGWIN_ARM_PLATFORM_FLAGS  =
 157 +
 158 +  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`
 159 +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`
 160 +
 161 +*_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork
 162 +*_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 163 +*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
 164 +*_RVCTCYGWIN_ARM_MAKE_PATH       = make
 165 +*_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
 166 +  DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
 167 +RELEASE_RVCTCYGWIN_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
 168 +
 169 +##################
 170 +# ARM definitions
 171 +##################
 172 +*_RVCTCYGWIN_ARM_CC_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 173 +*_RVCTCYGWIN_ARM_SLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 174 +*_RVCTCYGWIN_ARM_DLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 175 +*_RVCTCYGWIN_ARM_ASM_PATH        = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 176 +*_RVCTCYGWIN_ARM_PP_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 177 +*_RVCTCYGWIN_ARM_VFRPP_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 178 +*_RVCTCYGWIN_ARM_FROMELF_PATH    = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
 179 +
 180 +####################################################################################
 181 +#
 182  # ARM GCC (www.codesourcery.com)
 183  #
 184  ####################################################################################
 185 @@ -3484,7 +3610,7 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
 186  *_ARMGCC_*_*_FAMILY          = GCC
 187  *_ARMGCC_*_*_BUILDRULEFAMILY = ARMGCC
 188
 189 -*_ARMGCC_*_MAKE_PATH         = DEF(SOURCERY_TOOLS)/cs-make
 190 +*_ARMGCC_*_MAKE_PATH         = make
 191  *_ARMGCC_*_MAKE_FLAGS        = --no-print-directory
 192
 193  ##################
 194 @@ -3501,16 +3627,16 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
 195  # ARM definitions
 196  ##################
 197
 198 -*_ARMGCC_ARM_ASLCC_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 199 -*_ARMGCC_ARM_ASLDLINK_PATH   = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
 200 -*_ARMGCC_ARM_ASLPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 201 +*_ARMGCC_ARM_ASLCC_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 202 +*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
 203 +*_ARMGCC_ARM_ASLPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 204
 205 -*_ARMGCC_ARM_CC_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 206 -*_ARMGCC_ARM_SLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ar
 207 -*_ARMGCC_ARM_DLINK_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld
 208 -*_ARMGCC_ARM_ASM_PATH        = DEF(SOURCERY_TOOLS)/arm-none-eabi-as
 209 -*_ARMGCC_ARM_PP_PATH         = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 210 -*_ARMGCC_ARM_VFRPP_PATH      = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc
 211 +*_ARMGCC_ARM_CC_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 212 +*_ARMGCC_ARM_SLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar
 213 +*_ARMGCC_ARM_DLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
 214 +*_ARMGCC_ARM_ASM_PATH        = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as
 215 +*_ARMGCC_ARM_PP_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 216 +*_ARMGCC_ARM_VFRPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
 217
 218  #
 219  # Use default values, or override in DSC file
 220 --
 221 1.6.3.3
 222