summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2022-01-07 09:04:37 -0800
committerMark Hatle <mark.hatle@xilinx.com>2022-01-07 09:04:37 -0800
commit87e27648b2984f22aa1bd806dfc26f4ca2b6b0bb (patch)
tree518fd4a0d70d6ab16ba9b2ea501fc01406fde4cf
parent0c2df3ab8c76f17e15045d7a287b9edcf84d8cc3 (diff)
downloadmeta-xilinx-87e27648b2984f22aa1bd806dfc26f4ca2b6b0bb.tar.gz
Revert "microblaze-tc: Remove bigendian variants per tc group"
This reverts commit a6d0eac8564fd02425b1260e58c552589586cf3d. The toolchain itself has internal expectations of big-endian libraries being available, even when building little-endian components. It uses relative paths that include certain big-endian path locations. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-standalone/conf/machine/microblaze-tc.conf185
1 files changed, 180 insertions, 5 deletions
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
index 181eda93..372a8fba 100644
--- a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
+++ b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
@@ -12,6 +12,22 @@ LINKER_HASH_STYLE:microblaze = ""
12# Define all of the multilibs supproted by this configuration 12# Define all of the multilibs supproted by this configuration
13MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 13MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
14 14
15MULTILIBS += "multilib:libmble"
16MULTILIBS += "multilib:libmbbs"
17MULTILIBS += "multilib:libmbp"
18MULTILIBS += "multilib:libmbm"
19MULTILIBS += "multilib:libmbfpd"
20MULTILIBS += "multilib:libmbmfpd"
21MULTILIBS += "multilib:libmbpm"
22MULTILIBS += "multilib:libmbpfpd"
23MULTILIBS += "multilib:libmbpmfpd"
24MULTILIBS += "multilib:libmbbsp"
25MULTILIBS += "multilib:libmbbsm"
26MULTILIBS += "multilib:libmbbsfpd"
27MULTILIBS += "multilib:libmbbsmfpd"
28MULTILIBS += "multilib:libmbbspm"
29MULTILIBS += "multilib:libmbbspfpd"
30MULTILIBS += "multilib:libmbbspmfpd"
15MULTILIBS += "multilib:libmblem64" 31MULTILIBS += "multilib:libmblem64"
16MULTILIBS += "multilib:libmblebs" 32MULTILIBS += "multilib:libmblebs"
17MULTILIBS += "multilib:libmblep" 33MULTILIBS += "multilib:libmblep"
@@ -45,17 +61,176 @@ MULTILIBS += "multilib:libmblem64bspfpd"
45MULTILIBS += "multilib:libmblem64bspmfpd" 61MULTILIBS += "multilib:libmblem64bspmfpd"
46 62
47 63
48# Base configuration (le) 64# Base configuration
49# CFLAGS: -mlittle-endian 65# CFLAGS:
50DEFAULTTUNE = "microblaze" 66DEFAULTTUNE = "microblaze"
51 67
52AVAILTUNES += "microblaze" 68AVAILTUNES += "microblaze"
53BASE_LIB:tune-microblaze = "lib/le" 69BASE_LIB:tune-microblaze = "lib"
54 70TUNE_FEATURES:tune-microblaze = "microblaze bigendian"
55TUNE_FEATURES:tune-microblaze = "microblaze"
56PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}" 71PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"
57 72
58 73
74# le
75# CFLAGS: -mlittle-endian
76DEFAULTTUNE:virtclass-multilib-libmble = "microblazele"
77
78AVAILTUNES += "microblazele"
79BASE_LIB:tune-microblazele = "lib/le"
80TUNE_FEATURES:tune-microblazele = "microblaze"
81PACKAGE_EXTRA_ARCHS:tune-microblazele = "${TUNE_PKGARCH}"
82
83
84# bs
85# CFLAGS: -mxl-barrel-shift
86DEFAULTTUNE:virtclass-multilib-libmbbs = "microblazebs"
87
88AVAILTUNES += "microblazebs"
89BASE_LIB:tune-microblazebs = "lib/bs"
90TUNE_FEATURES:tune-microblazebs = "microblaze bigendian barrel-shift"
91PACKAGE_EXTRA_ARCHS:tune-microblazebs = "${TUNE_PKGARCH}"
92
93
94# p
95# CFLAGS: -mxl-pattern-compare
96DEFAULTTUNE:virtclass-multilib-libmbp = "microblazep"
97
98AVAILTUNES += "microblazep"
99BASE_LIB:tune-microblazep = "lib/p"
100TUNE_FEATURES:tune-microblazep = "microblaze bigendian pattern-compare"
101PACKAGE_EXTRA_ARCHS:tune-microblazep = "${TUNE_PKGARCH}"
102
103
104# m
105# CFLAGS: -mno-xl-soft-mul
106DEFAULTTUNE:virtclass-multilib-libmbm = "microblazem"
107
108AVAILTUNES += "microblazem"
109BASE_LIB:tune-microblazem = "lib/m"
110TUNE_FEATURES:tune-microblazem = "microblaze bigendian multiply-low"
111PACKAGE_EXTRA_ARCHS:tune-microblazem = "${TUNE_PKGARCH}"
112
113
114# fpd
115# CFLAGS: -mhard-float
116DEFAULTTUNE:virtclass-multilib-libmbfpd = "microblazefpd"
117
118AVAILTUNES += "microblazefpd"
119BASE_LIB:tune-microblazefpd = "lib/fpd"
120TUNE_FEATURES:tune-microblazefpd = "microblaze bigendian fpu-hard"
121PACKAGE_EXTRA_ARCHS:tune-microblazefpd = "${TUNE_PKGARCH}"
122
123
124# m/fpd
125# CFLAGS: -mno-xl-soft-mul -mhard-float
126DEFAULTTUNE:virtclass-multilib-libmbmfpd = "microblazemfpd"
127
128AVAILTUNES += "microblazemfpd"
129BASE_LIB:tune-microblazemfpd = "lib/m/fpd"
130TUNE_FEATURES:tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard"
131PACKAGE_EXTRA_ARCHS:tune-microblazemfpd = "${TUNE_PKGARCH}"
132
133
134# p/m
135# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul
136DEFAULTTUNE:virtclass-multilib-libmbpm = "microblazepm"
137
138AVAILTUNES += "microblazepm"
139BASE_LIB:tune-microblazepm = "lib/p/m"
140TUNE_FEATURES:tune-microblazepm = "microblaze bigendian pattern-compare multiply-low"
141PACKAGE_EXTRA_ARCHS:tune-microblazepm = "${TUNE_PKGARCH}"
142
143
144# p/fpd
145# CFLAGS: -mxl-pattern-compare -mhard-float
146DEFAULTTUNE:virtclass-multilib-libmbpfpd = "microblazepfpd"
147
148AVAILTUNES += "microblazepfpd"
149BASE_LIB:tune-microblazepfpd = "lib/p/fpd"
150TUNE_FEATURES:tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard"
151PACKAGE_EXTRA_ARCHS:tune-microblazepfpd = "${TUNE_PKGARCH}"
152
153
154# p/m/fpd
155# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
156DEFAULTTUNE:virtclass-multilib-libmbpmfpd = "microblazepmfpd"
157
158AVAILTUNES += "microblazepmfpd"
159BASE_LIB:tune-microblazepmfpd = "lib/p/m/fpd"
160TUNE_FEATURES:tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard"
161PACKAGE_EXTRA_ARCHS:tune-microblazepmfpd = "${TUNE_PKGARCH}"
162
163
164# bs/p
165# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare
166DEFAULTTUNE:virtclass-multilib-libmbbsp = "microblazebsp"
167
168AVAILTUNES += "microblazebsp"
169BASE_LIB:tune-microblazebsp = "lib/bs/p"
170TUNE_FEATURES:tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare"
171PACKAGE_EXTRA_ARCHS:tune-microblazebsp = "${TUNE_PKGARCH}"
172
173
174# bs/m
175# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul
176DEFAULTTUNE:virtclass-multilib-libmbbsm = "microblazebsm"
177
178AVAILTUNES += "microblazebsm"
179BASE_LIB:tune-microblazebsm = "lib/bs/m"
180TUNE_FEATURES:tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low"
181PACKAGE_EXTRA_ARCHS:tune-microblazebsm = "${TUNE_PKGARCH}"
182
183
184# bs/fpd
185# CFLAGS: -mxl-barrel-shift -mhard-float
186DEFAULTTUNE:virtclass-multilib-libmbbsfpd = "microblazebsfpd"
187
188AVAILTUNES += "microblazebsfpd"
189BASE_LIB:tune-microblazebsfpd = "lib/bs/fpd"
190TUNE_FEATURES:tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard"
191PACKAGE_EXTRA_ARCHS:tune-microblazebsfpd = "${TUNE_PKGARCH}"
192
193
194# bs/m/fpd
195# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
196DEFAULTTUNE:virtclass-multilib-libmbbsmfpd = "microblazebsmfpd"
197
198AVAILTUNES += "microblazebsmfpd"
199BASE_LIB:tune-microblazebsmfpd = "lib/bs/m/fpd"
200TUNE_FEATURES:tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard"
201PACKAGE_EXTRA_ARCHS:tune-microblazebsmfpd = "${TUNE_PKGARCH}"
202
203
204# bs/p/m
205# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
206DEFAULTTUNE:virtclass-multilib-libmbbspm = "microblazebspm"
207
208AVAILTUNES += "microblazebspm"
209BASE_LIB:tune-microblazebspm = "lib/bs/p/m"
210TUNE_FEATURES:tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low"
211PACKAGE_EXTRA_ARCHS:tune-microblazebspm = "${TUNE_PKGARCH}"
212
213
214# bs/p/fpd
215# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mhard-float
216DEFAULTTUNE:virtclass-multilib-libmbbspfpd = "microblazebspfpd"
217
218AVAILTUNES += "microblazebspfpd"
219BASE_LIB:tune-microblazebspfpd = "lib/bs/p/fpd"
220TUNE_FEATURES:tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard"
221PACKAGE_EXTRA_ARCHS:tune-microblazebspfpd = "${TUNE_PKGARCH}"
222
223
224# bs/p/m/fpd
225# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
226DEFAULTTUNE:virtclass-multilib-libmbbspmfpd = "microblazebspmfpd"
227
228AVAILTUNES += "microblazebspmfpd"
229BASE_LIB:tune-microblazebspmfpd = "lib/bs/p/m/fpd"
230TUNE_FEATURES:tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard"
231PACKAGE_EXTRA_ARCHS:tune-microblazebspmfpd = "${TUNE_PKGARCH}"
232
233
59# le/m64 234# le/m64
60# CFLAGS: -mlittle-endian -m64 235# CFLAGS: -mlittle-endian -m64
61DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64" 236DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64"