aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2005-12-13 09:54:15 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2005-12-13 09:54:15 +0000
commitce9d566844297f5d36887a0a19913fea8927e664 (patch)
tree64f41c1f3510f1b171d225b8444c21d8f00813be
parent93fc8073fc425f684cc58ac301464c1e90f2770d (diff)
downloadgcc-ce9d566844297f5d36887a0a19913fea8927e664.zip
gcc-ce9d566844297f5d36887a0a19913fea8927e664.tar.gz
gcc-ce9d566844297f5d36887a0a19913fea8927e664.tar.bz2
t-mt (MULTILIB_OPTIONS): Add ms2
* config/mt/t-mt (MULTILIB_OPTIONS): Add ms2 (MULTILIB_DIRNAMES): Add ms2. Prefix ms1 dirs with 'ms1'. * config/mt/mt.c (ms1_final_prescan): Use TARGET_MS2, TARGET_MS1_64_001 appropriately. (ms1_machine_reorg): Use TARGET_MS2. From-SVN: r108477
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/mt/mt.c13
-rw-r--r--gcc/config/mt/t-mt4
3 files changed, 16 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc2131f..0a6bd70 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-13 Nathan Sidwell <nathan@codesourcery.com>
+
+ * config/mt/t-mt (MULTILIB_OPTIONS): Add ms2
+ (MULTILIB_DIRNAMES): Add ms2. Prefix ms1 dirs with 'ms1'.
+ * config/mt/mt.c (ms1_final_prescan): Use TARGET_MS2,
+ TARGET_MS1_64_001 appropriately.
+ (ms1_machine_reorg): Use TARGET_MS2.
+
2005-12-13 Jakub Jelinek <jakub@redhat.com>
PR debug/25023
diff --git a/gcc/config/mt/mt.c b/gcc/config/mt/mt.c
index 74a77e8..675ec2d 100644
--- a/gcc/config/mt/mt.c
+++ b/gcc/config/mt/mt.c
@@ -221,7 +221,7 @@ ms1_final_prescan_insn (rtx insn,
ms1_nop_reasons = "";
/* ms2 constraints are dealt with in reorg. */
- if (ms1_cpu == PROCESSOR_MS2)
+ if (TARGET_MS2)
return;
/* Only worry about real instructions. */
@@ -257,7 +257,7 @@ ms1_final_prescan_insn (rtx insn,
case TYPE_STORE:
/* Avoid consecutive memory operation. */
if ((prev_attr == TYPE_LOAD || prev_attr == TYPE_STORE)
- && ms1_cpu == PROCESSOR_MS1_64_001)
+ && TARGET_MS1_64_001)
{
ms1_nops_required = 1;
ms1_nop_reasons = "consecutive mem ops";
@@ -279,8 +279,7 @@ ms1_final_prescan_insn (rtx insn,
case TYPE_BRANCH:
if (insn_dependent_p (prev_i, insn))
{
- if (prev_attr == TYPE_ARITH
- && ms1_cpu == PROCESSOR_MS1_64_001)
+ if (prev_attr == TYPE_ARITH && TARGET_MS1_64_001)
{
/* One cycle of delay between arith
instructions and branch dependent on arith. */
@@ -291,7 +290,7 @@ ms1_final_prescan_insn (rtx insn,
{
/* Two cycles of delay are required
between load and dependent branch. */
- if (ms1_cpu == PROCESSOR_MS1_64_001)
+ if (TARGET_MS1_64_001)
ms1_nops_required = 2;
else
ms1_nops_required = 1;
@@ -2465,13 +2464,13 @@ ms1_reorg_hazard (void)
static void
ms1_machine_reorg (void)
{
- if (cfun->machine->has_loops)
+ if (cfun->machine->has_loops && TARGET_MS2)
ms1_reorg_loops (dump_file);
if (ms1_flag_delayed_branch)
dbr_schedule (get_insns (), dump_file);
- if (ms1_cpu == PROCESSOR_MS2)
+ if (TARGET_MS2)
ms1_reorg_hazard ();
}
diff --git a/gcc/config/mt/t-mt b/gcc/config/mt/t-mt
index 5e400eb..24924e4 100644
--- a/gcc/config/mt/t-mt
+++ b/gcc/config/mt/t-mt
@@ -59,8 +59,8 @@ crtn.o: $(srcdir)/config/mt/crtn.asm $(GCC_PASSES)
# See gcc/genmultilib, gcc/gcc.texi and gcc/tm.texi for a
# description of the options and their values.
#
-MULTILIB_OPTIONS = march=ms1-64-001/march=ms1-16-002/march=ms1-16-003
-MULTILIB_DIRNAMES = 64-001 16-002 16-003
+MULTILIB_OPTIONS = march=ms1-64-001/march=ms1-16-002/march=ms1-16-003/march=ms2
+MULTILIB_DIRNAMES = ms1-64-001 ms1-16-002 ms1-16-003 ms2
# MULTILIB_MATCHES =
# MULTILIB_EXCEPTIONS =
# MULTILIB_EXTRA_OPTS =