diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-07 09:04:37 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-07 09:04:37 -0800 |
| commit | 87e27648b2984f22aa1bd806dfc26f4ca2b6b0bb (patch) | |
| tree | 518fd4a0d70d6ab16ba9b2ea501fc01406fde4cf | |
| parent | 0c2df3ab8c76f17e15045d7a287b9edcf84d8cc3 (diff) | |
| download | meta-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.conf | 185 |
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 |
| 13 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" | 13 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" |
| 14 | 14 | ||
| 15 | MULTILIBS += "multilib:libmble" | ||
| 16 | MULTILIBS += "multilib:libmbbs" | ||
| 17 | MULTILIBS += "multilib:libmbp" | ||
| 18 | MULTILIBS += "multilib:libmbm" | ||
| 19 | MULTILIBS += "multilib:libmbfpd" | ||
| 20 | MULTILIBS += "multilib:libmbmfpd" | ||
| 21 | MULTILIBS += "multilib:libmbpm" | ||
| 22 | MULTILIBS += "multilib:libmbpfpd" | ||
| 23 | MULTILIBS += "multilib:libmbpmfpd" | ||
| 24 | MULTILIBS += "multilib:libmbbsp" | ||
| 25 | MULTILIBS += "multilib:libmbbsm" | ||
| 26 | MULTILIBS += "multilib:libmbbsfpd" | ||
| 27 | MULTILIBS += "multilib:libmbbsmfpd" | ||
| 28 | MULTILIBS += "multilib:libmbbspm" | ||
| 29 | MULTILIBS += "multilib:libmbbspfpd" | ||
| 30 | MULTILIBS += "multilib:libmbbspmfpd" | ||
| 15 | MULTILIBS += "multilib:libmblem64" | 31 | MULTILIBS += "multilib:libmblem64" |
| 16 | MULTILIBS += "multilib:libmblebs" | 32 | MULTILIBS += "multilib:libmblebs" |
| 17 | MULTILIBS += "multilib:libmblep" | 33 | MULTILIBS += "multilib:libmblep" |
| @@ -45,17 +61,176 @@ MULTILIBS += "multilib:libmblem64bspfpd" | |||
| 45 | MULTILIBS += "multilib:libmblem64bspmfpd" | 61 | MULTILIBS += "multilib:libmblem64bspmfpd" |
| 46 | 62 | ||
| 47 | 63 | ||
| 48 | # Base configuration (le) | 64 | # Base configuration |
| 49 | # CFLAGS: -mlittle-endian | 65 | # CFLAGS: |
| 50 | DEFAULTTUNE = "microblaze" | 66 | DEFAULTTUNE = "microblaze" |
| 51 | 67 | ||
| 52 | AVAILTUNES += "microblaze" | 68 | AVAILTUNES += "microblaze" |
| 53 | BASE_LIB:tune-microblaze = "lib/le" | 69 | BASE_LIB:tune-microblaze = "lib" |
| 54 | 70 | TUNE_FEATURES:tune-microblaze = "microblaze bigendian" | |
| 55 | TUNE_FEATURES:tune-microblaze = "microblaze" | ||
| 56 | PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}" | 71 | PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}" |
| 57 | 72 | ||
| 58 | 73 | ||
| 74 | # le | ||
| 75 | # CFLAGS: -mlittle-endian | ||
| 76 | DEFAULTTUNE:virtclass-multilib-libmble = "microblazele" | ||
| 77 | |||
| 78 | AVAILTUNES += "microblazele" | ||
| 79 | BASE_LIB:tune-microblazele = "lib/le" | ||
| 80 | TUNE_FEATURES:tune-microblazele = "microblaze" | ||
| 81 | PACKAGE_EXTRA_ARCHS:tune-microblazele = "${TUNE_PKGARCH}" | ||
| 82 | |||
| 83 | |||
| 84 | # bs | ||
| 85 | # CFLAGS: -mxl-barrel-shift | ||
| 86 | DEFAULTTUNE:virtclass-multilib-libmbbs = "microblazebs" | ||
| 87 | |||
| 88 | AVAILTUNES += "microblazebs" | ||
| 89 | BASE_LIB:tune-microblazebs = "lib/bs" | ||
| 90 | TUNE_FEATURES:tune-microblazebs = "microblaze bigendian barrel-shift" | ||
| 91 | PACKAGE_EXTRA_ARCHS:tune-microblazebs = "${TUNE_PKGARCH}" | ||
| 92 | |||
| 93 | |||
| 94 | # p | ||
| 95 | # CFLAGS: -mxl-pattern-compare | ||
| 96 | DEFAULTTUNE:virtclass-multilib-libmbp = "microblazep" | ||
| 97 | |||
| 98 | AVAILTUNES += "microblazep" | ||
| 99 | BASE_LIB:tune-microblazep = "lib/p" | ||
| 100 | TUNE_FEATURES:tune-microblazep = "microblaze bigendian pattern-compare" | ||
| 101 | PACKAGE_EXTRA_ARCHS:tune-microblazep = "${TUNE_PKGARCH}" | ||
| 102 | |||
| 103 | |||
| 104 | # m | ||
| 105 | # CFLAGS: -mno-xl-soft-mul | ||
| 106 | DEFAULTTUNE:virtclass-multilib-libmbm = "microblazem" | ||
| 107 | |||
| 108 | AVAILTUNES += "microblazem" | ||
| 109 | BASE_LIB:tune-microblazem = "lib/m" | ||
| 110 | TUNE_FEATURES:tune-microblazem = "microblaze bigendian multiply-low" | ||
| 111 | PACKAGE_EXTRA_ARCHS:tune-microblazem = "${TUNE_PKGARCH}" | ||
| 112 | |||
| 113 | |||
| 114 | # fpd | ||
| 115 | # CFLAGS: -mhard-float | ||
| 116 | DEFAULTTUNE:virtclass-multilib-libmbfpd = "microblazefpd" | ||
| 117 | |||
| 118 | AVAILTUNES += "microblazefpd" | ||
| 119 | BASE_LIB:tune-microblazefpd = "lib/fpd" | ||
| 120 | TUNE_FEATURES:tune-microblazefpd = "microblaze bigendian fpu-hard" | ||
| 121 | PACKAGE_EXTRA_ARCHS:tune-microblazefpd = "${TUNE_PKGARCH}" | ||
| 122 | |||
| 123 | |||
| 124 | # m/fpd | ||
| 125 | # CFLAGS: -mno-xl-soft-mul -mhard-float | ||
| 126 | DEFAULTTUNE:virtclass-multilib-libmbmfpd = "microblazemfpd" | ||
| 127 | |||
| 128 | AVAILTUNES += "microblazemfpd" | ||
| 129 | BASE_LIB:tune-microblazemfpd = "lib/m/fpd" | ||
| 130 | TUNE_FEATURES:tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard" | ||
| 131 | PACKAGE_EXTRA_ARCHS:tune-microblazemfpd = "${TUNE_PKGARCH}" | ||
| 132 | |||
| 133 | |||
| 134 | # p/m | ||
| 135 | # CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul | ||
| 136 | DEFAULTTUNE:virtclass-multilib-libmbpm = "microblazepm" | ||
| 137 | |||
| 138 | AVAILTUNES += "microblazepm" | ||
| 139 | BASE_LIB:tune-microblazepm = "lib/p/m" | ||
| 140 | TUNE_FEATURES:tune-microblazepm = "microblaze bigendian pattern-compare multiply-low" | ||
| 141 | PACKAGE_EXTRA_ARCHS:tune-microblazepm = "${TUNE_PKGARCH}" | ||
| 142 | |||
| 143 | |||
| 144 | # p/fpd | ||
| 145 | # CFLAGS: -mxl-pattern-compare -mhard-float | ||
| 146 | DEFAULTTUNE:virtclass-multilib-libmbpfpd = "microblazepfpd" | ||
| 147 | |||
| 148 | AVAILTUNES += "microblazepfpd" | ||
| 149 | BASE_LIB:tune-microblazepfpd = "lib/p/fpd" | ||
| 150 | TUNE_FEATURES:tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard" | ||
| 151 | PACKAGE_EXTRA_ARCHS:tune-microblazepfpd = "${TUNE_PKGARCH}" | ||
| 152 | |||
| 153 | |||
| 154 | # p/m/fpd | ||
| 155 | # CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -mhard-float | ||
| 156 | DEFAULTTUNE:virtclass-multilib-libmbpmfpd = "microblazepmfpd" | ||
| 157 | |||
| 158 | AVAILTUNES += "microblazepmfpd" | ||
| 159 | BASE_LIB:tune-microblazepmfpd = "lib/p/m/fpd" | ||
| 160 | TUNE_FEATURES:tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard" | ||
| 161 | PACKAGE_EXTRA_ARCHS:tune-microblazepmfpd = "${TUNE_PKGARCH}" | ||
| 162 | |||
| 163 | |||
| 164 | # bs/p | ||
| 165 | # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare | ||
| 166 | DEFAULTTUNE:virtclass-multilib-libmbbsp = "microblazebsp" | ||
| 167 | |||
| 168 | AVAILTUNES += "microblazebsp" | ||
| 169 | BASE_LIB:tune-microblazebsp = "lib/bs/p" | ||
| 170 | TUNE_FEATURES:tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare" | ||
| 171 | PACKAGE_EXTRA_ARCHS:tune-microblazebsp = "${TUNE_PKGARCH}" | ||
| 172 | |||
| 173 | |||
| 174 | # bs/m | ||
| 175 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul | ||
| 176 | DEFAULTTUNE:virtclass-multilib-libmbbsm = "microblazebsm" | ||
| 177 | |||
| 178 | AVAILTUNES += "microblazebsm" | ||
| 179 | BASE_LIB:tune-microblazebsm = "lib/bs/m" | ||
| 180 | TUNE_FEATURES:tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low" | ||
| 181 | PACKAGE_EXTRA_ARCHS:tune-microblazebsm = "${TUNE_PKGARCH}" | ||
| 182 | |||
| 183 | |||
| 184 | # bs/fpd | ||
| 185 | # CFLAGS: -mxl-barrel-shift -mhard-float | ||
| 186 | DEFAULTTUNE:virtclass-multilib-libmbbsfpd = "microblazebsfpd" | ||
| 187 | |||
| 188 | AVAILTUNES += "microblazebsfpd" | ||
| 189 | BASE_LIB:tune-microblazebsfpd = "lib/bs/fpd" | ||
| 190 | TUNE_FEATURES:tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard" | ||
| 191 | PACKAGE_EXTRA_ARCHS:tune-microblazebsfpd = "${TUNE_PKGARCH}" | ||
| 192 | |||
| 193 | |||
| 194 | # bs/m/fpd | ||
| 195 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mhard-float | ||
| 196 | DEFAULTTUNE:virtclass-multilib-libmbbsmfpd = "microblazebsmfpd" | ||
| 197 | |||
| 198 | AVAILTUNES += "microblazebsmfpd" | ||
| 199 | BASE_LIB:tune-microblazebsmfpd = "lib/bs/m/fpd" | ||
| 200 | TUNE_FEATURES:tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard" | ||
| 201 | PACKAGE_EXTRA_ARCHS:tune-microblazebsmfpd = "${TUNE_PKGARCH}" | ||
| 202 | |||
| 203 | |||
| 204 | # bs/p/m | ||
| 205 | # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul | ||
| 206 | DEFAULTTUNE:virtclass-multilib-libmbbspm = "microblazebspm" | ||
| 207 | |||
| 208 | AVAILTUNES += "microblazebspm" | ||
| 209 | BASE_LIB:tune-microblazebspm = "lib/bs/p/m" | ||
| 210 | TUNE_FEATURES:tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low" | ||
| 211 | PACKAGE_EXTRA_ARCHS:tune-microblazebspm = "${TUNE_PKGARCH}" | ||
| 212 | |||
| 213 | |||
| 214 | # bs/p/fpd | ||
| 215 | # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mhard-float | ||
| 216 | DEFAULTTUNE:virtclass-multilib-libmbbspfpd = "microblazebspfpd" | ||
| 217 | |||
| 218 | AVAILTUNES += "microblazebspfpd" | ||
| 219 | BASE_LIB:tune-microblazebspfpd = "lib/bs/p/fpd" | ||
| 220 | TUNE_FEATURES:tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard" | ||
| 221 | PACKAGE_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 | ||
| 226 | DEFAULTTUNE:virtclass-multilib-libmbbspmfpd = "microblazebspmfpd" | ||
| 227 | |||
| 228 | AVAILTUNES += "microblazebspmfpd" | ||
| 229 | BASE_LIB:tune-microblazebspmfpd = "lib/bs/p/m/fpd" | ||
| 230 | TUNE_FEATURES:tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard" | ||
| 231 | PACKAGE_EXTRA_ARCHS:tune-microblazebspmfpd = "${TUNE_PKGARCH}" | ||
| 232 | |||
| 233 | |||
| 59 | # le/m64 | 234 | # le/m64 |
| 60 | # CFLAGS: -mlittle-endian -m64 | 235 | # CFLAGS: -mlittle-endian -m64 |
| 61 | DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64" | 236 | DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64" |
