re PR target/50617 (ICE: RTL flag check: INSN_ANNULLED_BRANCH_P used with unexpected...

	PR target/50617
	* config/pa/pa-protos.h (output_bb): Rename to pa_output_bb.
	* config/pa/pa.md: Likewise.
	* config/pa/pa.c: Likewise.

From-SVN: r180663

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 296ac8c181e40a01702a8bfbd2cf70c0454bec4a..d3888bda0a33216315b910a55172ac0d59d115b9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-29  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
+       PR target/50617
+       * config/pa/pa-protos.h (output_bb): Rename to pa_output_bb.
+       * config/pa/pa.md: Likewise.
+       * config/pa/pa.c: Likewise.
+
        PR target/50691
        * config/pa/pa.c (emit_move_sequence): Legitimize TLS symbol references.
        * config/pa/pa.h (LEGITIMATE_CONSTANT_P): Return false for

diff --git a/gcc/config/pa/pa-protos.h b/gcc/config/pa/pa-protos.h
index dc42e55012f92ec90bb3063c6f3f6c2317c11c72..74fd51d8a5bbe1b1b31645377680cc018dd54e6a 100644 (file)
--- a/gcc/config/pa/pa-protos.h
+++ b/gcc/config/pa/pa-protos.h
@@ -40,7 +40,7 @@ extern const char *output_block_move (rtx *, int);
 extern const char *output_block_clear (rtx *, int);
 extern const char *output_cbranch (rtx *, int, rtx);
 extern const char *output_lbranch (rtx, rtx, int);
-extern const char *output_bb (rtx *, int, rtx, int);
+extern const char *pa_output_bb (rtx *, int, rtx, int);
 extern const char *output_bvb (rtx *, int, rtx, int);
 extern const char *output_dbra (rtx *, rtx, int);
 extern const char *output_movb (rtx *, rtx, int, int);

diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index d5780e5e6782c0a92460dbe020dc29b09cd9f35f..91c27bac09b7f01eb759603527e9434d323d2285 100644 (file)
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -6722,7 +6722,7 @@ output_lbranch (rtx dest, rtx insn, int xdelay)
    above.  it returns the appropriate output template to emit the branch.  */
 
 const char *
-output_bb (rtx *operands ATTRIBUTE_UNUSED, int negated, rtx insn, int which)
+pa_output_bb (rtx *operands ATTRIBUTE_UNUSED, int negated, rtx insn, int which)
 {
   static char buf[100];
   bool useskip;

diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md
index 1bd9f0b0ab643df78366d694412c1cd476ba9ae3..e8d5c45c3b59ef7e3690e70cc6f6e7d6a6b5dadd 100644 (file)
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -1507,7 +1507,7 @@
   ""
   "*
 {
-  return output_bb (operands, 0, insn, 0);
+  return pa_output_bb (operands, 0, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1535,7 +1535,7 @@
   "TARGET_64BIT"
   "*
 {
-  return output_bb (operands, 0, insn, 0);
+  return pa_output_bb (operands, 0, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1563,7 +1563,7 @@
   ""
   "*
 {
-  return output_bb (operands, 1, insn, 0);
+  return pa_output_bb (operands, 1, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1591,7 +1591,7 @@
   "TARGET_64BIT"
   "*
 {
-  return output_bb (operands, 1, insn, 0);
+  return pa_output_bb (operands, 1, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1619,7 +1619,7 @@
   ""
   "*
 {
-  return output_bb (operands, 0, insn, 1);
+  return pa_output_bb (operands, 0, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1647,7 +1647,7 @@
   "TARGET_64BIT"
   "*
 {
-  return output_bb (operands, 0, insn, 1);
+  return pa_output_bb (operands, 0, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1675,7 +1675,7 @@
   ""
   "*
 {
-  return output_bb (operands, 1, insn, 1);
+  return pa_output_bb (operands, 1, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1703,7 +1703,7 @@
   "TARGET_64BIT"
   "*
 {
-  return output_bb (operands, 1, insn, 1);
+  return pa_output_bb (operands, 1, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")