[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/vax include builtins.md in...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06d3e39b73c2
branches:  trunk
changeset: 771126:06d3e39b73c2
user:      chs <chs%NetBSD.org@localhost>
date:      Thu Nov 10 17:16:30 2011 +0000

description:
include builtins.md in vax.md so that ffs is defined.
update for conditional branch changes in gcc.

diffstat:

 external/gpl3/gcc/dist/gcc/config/vax/builtins.md |  9 +++++++--
 external/gpl3/gcc/dist/gcc/config/vax/vax.md      |  2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r cff48c9a3088 -r 06d3e39b73c2 external/gpl3/gcc/dist/gcc/config/vax/builtins.md
--- a/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Thu Nov 10 17:10:00 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/vax/builtins.md Thu Nov 10 17:16:30 2011 +0000
@@ -24,6 +24,12 @@
   ]
 )
 
+(define_expand "condjump"
+  [(set (pc)
+       (if_then_else (match_operand 0)
+                     (label_ref (match_operand 1))
+                     (pc)))])
+
 (define_expand "ffssi2"
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (ffs:SI (match_operand:SI 1 "general_operand" "")))]
@@ -32,7 +38,7 @@
 {
   rtx label = gen_label_rtx ();
   emit_insn (gen_ffssi2_internal (operands[0], operands[1]));
-  emit_jump_insn (gen_bne (label));
+  emit_jump_insn (gen_condjump (gen_rtx_NE(VOIDmode, cc0_rtx, const0_rtx), label));
   emit_insn (gen_negsi2 (operands[0], const1_rtx));
   emit_label (label);
   emit_insn (gen_addsi3 (operands[0], operands[0], const1_rtx));
@@ -189,4 +195,3 @@
          (const_int 0))])]
   ""
   "jbcci %1,%0,%l2")
-
diff -r cff48c9a3088 -r 06d3e39b73c2 external/gpl3/gcc/dist/gcc/config/vax/vax.md
--- a/external/gpl3/gcc/dist/gcc/config/vax/vax.md      Thu Nov 10 17:10:00 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/vax/vax.md      Thu Nov 10 17:16:30 2011 +0000
@@ -1634,3 +1634,5 @@
   emit_barrier ();
   DONE;
 })
+
+(include "builtins.md")