diff options
| author | Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> | 2020-01-23 00:40:06 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2020-01-24 16:56:12 -0800 |
| commit | a03c94376187956352609887c25d2cb1fa4a0485 (patch) | |
| tree | b08eab3e3afe7040b981b4b4a06336f9d6500b1d | |
| parent | f493672c6c3ba2502333c9c4001323f80a313014 (diff) | |
| download | meta-xilinx-a03c94376187956352609887c25d2cb1fa4a0485.tar.gz | |
gcc-microblaze: Remove multilib builds that arent working (m64)
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
| -rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/gcc/gcc-9/avoid_multilib_builds_that_arent_working.patch | 29 | ||||
| -rw-r--r-- | meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_9.%.bbappend | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-9/avoid_multilib_builds_that_arent_working.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-9/avoid_multilib_builds_that_arent_working.patch new file mode 100644 index 00000000..6da9e7b9 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-9/avoid_multilib_builds_that_arent_working.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Index: gcc-9.2.0/gcc/config/microblaze/t-microblaze | ||
| 2 | =================================================================== | ||
| 3 | --- gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze | ||
| 4 | +++ gcc-9.2.0/gcc/config/microblaze/t-microblaze | ||
| 5 | @@ -1,9 +1,12 @@ | ||
| 6 | -MULTILIB_OPTIONS = m64 mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high | ||
| 7 | -MULTILIB_DIRNAMES = m64 bs le m mh | ||
| 8 | +MULTILIB_OPTIONS = mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high | ||
| 9 | +MULTILIB_DIRNAMES = bs le m mh | ||
| 10 | MULTILIB_EXCEPTIONS = *m64/mxl-multiply-high mxl-multiply-high | ||
| 11 | MULTILIB_EXCEPTIONS += *m64 | ||
| 12 | +MULTILIB_EXCEPTIONS += *m64/mlittle-endian | ||
| 13 | +MULTILIB_EXCEPTIONS += *m64/mlittle-endian/mxl-soft-mul | ||
| 14 | +MULTILIB_EXCEPTIONS += *m64/mlittle-endian/mno-xl-soft-mul | ||
| 15 | +MULTILIB_EXCEPTIONS += *m64/mlittle-endian/mno-xl-soft-mul/mxl-multiply-high | ||
| 16 | MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift | ||
| 17 | -MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul | ||
| 18 | MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul | ||
| 19 | MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul | ||
| 20 | MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul/mxl-multiply-high | ||
| 21 | @@ -12,6 +15,8 @@ MULTILIB_EXCEPTIONS += *mxl-barrel-shift | ||
| 22 | MULTILIB_EXCEPTIONS += *mlittle-endian/mxl-multiply-high mxl-multiply-high | ||
| 23 | MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mlittle-endian/mxl-multiply-high | ||
| 24 | |||
| 25 | + | ||
| 26 | + | ||
| 27 | # Extra files | ||
| 28 | microblaze-c.o: $(srcdir)/config/microblaze/microblaze-c.c \ | ||
| 29 | $(srcdir)/config/microblaze/microblaze-protos.h \ | ||
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_9.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_9.%.bbappend index c6ec78d8..5a635167 100644 --- a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_9.%.bbappend +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_9.%.bbappend | |||
| @@ -65,4 +65,5 @@ SRC_URI_append_microblaze = " \ | |||
| 65 | file://0062-Added-new-MB-64-single-register-arithmetic-instructi.patch \ | 65 | file://0062-Added-new-MB-64-single-register-arithmetic-instructi.patch \ |
| 66 | file://0063-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch \ | 66 | file://0063-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch \ |
| 67 | file://0064-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch \ | 67 | file://0064-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch \ |
| 68 | file://avoid_multilib_builds_that_arent_working.patch \ | ||
| 68 | " | 69 | " |