]>
Commit | Line | Data |
---|---|---|
597cb96f | 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 | |
597cb96f | 16 | @@ -3020,6 +3018,45 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL |
17 | *_ICC11x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r | |
18 | *_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\r | |
19 | \r | |
20 | +####################################################################################\r | |
21 | +#\r | |
22 | +# ARM RealView 4.0 Tools & Linux\r | |
23 | +#\r | |
24 | +####################################################################################\r | |
25 | +# ARMCYGWIN - Tools from ARM in a Cygwin environment\r | |
26 | +\r | |
27 | +*_RVCTLINUX_*_*_FAMILY = RVCT\r | |
28 | +*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r | |
29 | +\r | |
30 | +#\r | |
31 | +# Use default values, or override in DSC file\r | |
32 | +#\r | |
33 | +*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r | |
34 | +*_RVCTLINUX_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r | |
35 | +*_RVCTLINUX_ARM_ARCHDLINK_FLAGS = \r | |
36 | +*_RVCTLINUX_ARM_PLATFORM_FLAGS =\r | |
37 | +\r | |
38 | +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 \r | |
39 | +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\r | |
40 | +\r | |
41 | +*_RVCTLINUX_ARM_ASM_FLAGS = $(ASMPATH_FLAG) $(ARCHASM_FLAGS) --apcs /interwork\r | |
42 | +*_RVCTLINUX_ARM_PP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r | |
43 | +*_RVCTLINUX_ARM_VFRPP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r | |
44 | +*_RVCTLINUX_ARM_MAKE_PATH = make\r | |
45 | +*_RVCTLINUX_ARM_SLINK_FLAGS = $(SLINKPATH_FLAG) --partial -o\r | |
46 | + 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\r | |
47 | +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\r | |
48 | +\r | |
49 | +##################\r | |
50 | +# ARM definitions\r | |
51 | +##################\r | |
52 | +*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
53 | +*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r | |
54 | +*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r | |
55 | +*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r | |
56 | +*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
57 | +*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
58 | +*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r | |
59 | \r | |
60 | ####################################################################################\r | |
61 | #\r | |
62 | @@ -3387,7 +3424,7 @@ RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter | |
63 | \r | |
64 | ####################################################################################\r | |
65 | #\r | |
66 | -# ARM Tools\r | |
67 | +# ARM RealView 3.1 Tools\r | |
68 | #\r | |
69 | ####################################################################################\r | |
70 | # RVCT31 - Tools from ARM\r | |
71 | @@ -3427,7 +3464,7 @@ RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospac | |
72 | \r | |
73 | ####################################################################################\r | |
74 | #\r | |
75 | -# ARM Tools & Cygwin\r | |
76 | +# ARM RealView 3.1 Tools & Cygwin\r | |
77 | #\r | |
78 | ####################################################################################\r | |
79 | # ARMCYGWIN - Tools from ARM in a Cygwin environment\r | |
80 | @@ -3476,6 +3513,95 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM | |
81 | \r | |
82 | ####################################################################################\r | |
83 | #\r | |
84 | +# ARM RealView 4.0 Tools\r | |
85 | +#\r | |
86 | +####################################################################################\r | |
87 | +# RVCT - Tools from ARM\r | |
88 | +\r | |
89 | +*_RVCT_*_*_FAMILY = RVCT\r | |
90 | +\r | |
91 | +#\r | |
92 | +# Use default values, or override in DSC file\r | |
93 | +#\r | |
94 | +*_RVCT_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r | |
95 | +*_RVCT_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r | |
96 | +*_RVCT_ARM_ARCHDLINK_FLAGS = \r | |
97 | +*_RVCT_ARM_PLATFORM_FLAGS =\r | |
98 | +\r | |
99 | + 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 \r | |
100 | +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 \r | |
101 | +\r | |
102 | +\r | |
103 | +*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork\r | |
104 | +*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r | |
105 | +*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r | |
106 | +*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r | |
107 | +*_RVCT_ARM_SLINK_FLAGS = --partial -o\r | |
108 | + 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\r | |
109 | +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\r | |
110 | +\r | |
111 | +##################\r | |
112 | +# ARM definitions\r | |
113 | +##################\r | |
114 | +*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
115 | +*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r | |
116 | +*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r | |
117 | +*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r | |
118 | +*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
119 | +*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r | |
120 | +*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r | |
121 | +\r | |
122 | +####################################################################################\r | |
123 | +#\r | |
124 | +# ARM RealView 4.0 Tools & Cygwin\r | |
125 | +#\r | |
126 | +####################################################################################\r | |
127 | +# ARMCYGWIN - Tools from ARM in a Cygwin environment\r | |
128 | +\r | |
129 | +*_RVCTCYGWIN_*_*_FAMILY = RVCT\r | |
130 | +*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r | |
131 | +\r | |
132 | +*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r | |
133 | +*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r | |
134 | +*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r | |
135 | +*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r | |
136 | +*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r | |
137 | +*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r | |
138 | +*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r | |
139 | +\r | |
140 | +\r | |
141 | +#\r | |
142 | +# Use default values, or override in DSC file\r | |
143 | +#\r | |
144 | +*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r | |
145 | +*_RVCTCYGWIN_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r | |
146 | +*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = \r | |
147 | +*_RVCTCYGWIN_ARM_PLATFORM_FLAGS =\r | |
148 | +\r | |
149 | + 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` \r | |
150 | +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` \r | |
151 | +\r | |
152 | +*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork\r | |
153 | +*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r | |
154 | +*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r | |
155 | +*_RVCTCYGWIN_ARM_MAKE_PATH = make\r | |
156 | +*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r | |
157 | + 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\r | |
158 | +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\r | |
159 | +\r | |
160 | +##################\r | |
161 | +# ARM definitions\r | |
162 | +##################\r | |
163 | +*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
164 | +*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
165 | +*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
166 | +*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
167 | +*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
168 | +*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
169 | +*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r | |
170 | +\r | |
171 | +####################################################################################\r | |
172 | +#\r | |
173 | # ARM GCC (www.codesourcery.com)\r | |
174 | #\r | |
175 | ####################################################################################\r | |
597cb96f | 176 | -- |
177 | 1.6.3.3 | |
178 |