| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 1 | From 259ed1ee33625964f5bc394ae660103b6c35510f Mon Sep 17 00:00:00 2001 |
| 2 | From: Mahesh Bodapati <mbodapat@xilinx.com> |
| 3 | Date: Tue, 11 Sep 2018 13:43:48 +0530 |
| 4 | Subject: [PATCH 44/54] [Patch, Microblaze] : Support of multilibs with m64 ... |
| 5 | |
| 6 | --- |
| 7 | gcc/config/microblaze/microblaze-c.c | 1 + |
| 8 | gcc/config/microblaze/t-microblaze | 15 ++++++--------- |
| 9 | libgcc/config/microblaze/t-microblaze | 11 +++-------- |
| 10 | 3 files changed, 10 insertions(+), 17 deletions(-) |
| 11 | |
| 12 | diff --git a/gcc/config/microblaze/microblaze-c.c b/gcc/config/microblaze/microblaze-c.c |
| 13 | index d8a1d13..6586575 100644 |
| 14 | --- a/gcc/config/microblaze/microblaze-c.c |
| 15 | +++ b/gcc/config/microblaze/microblaze-c.c |
| 16 | @@ -102,6 +102,7 @@ microblaze_cpp_define (cpp_reader *pfile) |
| 17 | } |
| 18 | if (TARGET_MB_64) |
| 19 | { |
| 20 | + builtin_define ("__microblaze64"); |
| 21 | builtin_define ("__arch64__"); |
| 22 | builtin_define ("__microblaze64__"); |
| 23 | builtin_define ("__MICROBLAZE64__"); |
| 24 | diff --git a/gcc/config/microblaze/t-microblaze b/gcc/config/microblaze/t-microblaze |
| 25 | index 9fc80b1..35ab965 100644 |
| 26 | --- a/gcc/config/microblaze/t-microblaze |
| 27 | +++ b/gcc/config/microblaze/t-microblaze |
| 28 | @@ -1,12 +1,9 @@ |
| 29 | -MULTILIB_OPTIONS = mxl-barrel-shift mno-xl-soft-mul mxl-multiply-high mlittle-endian m64 |
| 30 | -MULTILIB_DIRNAMES = bs m mh le m64 |
| 31 | -MULTILIB_EXCEPTIONS = *mxl-barrel-shift/mxl-multiply-high mxl-multiply-high |
| 32 | -MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high/mlittle-endian |
| 33 | -MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high/mlittle-endian/m64 |
| 34 | -MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high/m64 mxl-multiply-high |
| 35 | -MULTILIB_EXCEPTIONS += mxl-multiply-high/mlittle-endian |
| 36 | -MULTILIB_EXCEPTIONS += mxl-multiply-high/m64 |
| 37 | -MULTILIB_EXCEPTIONS += *mxl-multiply-high/mlittle-endian/m64 |
| 38 | +MULTILIB_OPTIONS = m64 mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high |
| 39 | +MULTILIB_DIRNAMES = m64 bs le m mh |
| 40 | +MULTILIB_EXCEPTIONS = *m64/mxl-multiply-high mxl-multiply-high |
| 41 | +MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high mxl-multiply-high |
| 42 | +MULTILIB_EXCEPTIONS += *mlittle-endian/mxl-multiply-high mxl-multiply-high |
| 43 | +MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mlittle-endian/mxl-multiply-high |
| 44 | |
| 45 | # Extra files |
| 46 | microblaze-c.o: $(srcdir)/config/microblaze/microblaze-c.c \ |
| 47 | diff --git a/libgcc/config/microblaze/t-microblaze b/libgcc/config/microblaze/t-microblaze |
| 48 | index 35021b2..8d954a4 100644 |
| 49 | --- a/libgcc/config/microblaze/t-microblaze |
| 50 | +++ b/libgcc/config/microblaze/t-microblaze |
| 51 | @@ -1,16 +1,11 @@ |
| 52 | -LIB2FUNCS_EXCLUDE += _divsi3 _modsi3 _mulsi3 _udivsi3 _umodsi3 \ |
| 53 | - _divdi3 _moddi3 _muldi3 _udivdi3 _umoddi3 |
| 54 | +LIB2FUNCS_EXCLUDE += _divsi3 _modsi3 _mulsi3 _udivsi3 _umodsi3 |
| 55 | |
| 56 | LIB2ADD += \ |
| 57 | $(srcdir)/config/microblaze/divsi3.S \ |
| 58 | - $(srcdir)/config/microblaze/divdi3.S \ |
| 59 | $(srcdir)/config/microblaze/modsi3.S \ |
| 60 | - $(srcdir)/config/microblaze/moddi3.S \ |
| 61 | + $(srcdir)/config/microblaze/muldi3_hard.S \ |
| 62 | $(srcdir)/config/microblaze/mulsi3.S \ |
| 63 | - $(srcdir)/config/microblaze/muldi3.S \ |
| 64 | $(srcdir)/config/microblaze/stack_overflow_exit.S \ |
| 65 | $(srcdir)/config/microblaze/udivsi3.S \ |
| 66 | - $(srcdir)/config/microblaze/udivdi3.S \ |
| 67 | $(srcdir)/config/microblaze/umodsi3.S \ |
| 68 | - $(srcdir)/config/microblaze/umoddi3.S \ |
| 69 | - $(srcdir)/config/microblaze/divsi3_table.c \ |
| 70 | + $(srcdir)/config/microblaze/divsi3_table.c |
| 71 | -- |
| 72 | 2.7.4 |
| 73 | |