From: John David Anglin <danglin@gcc.gnu.org>
Date: Sat, 29 Oct 2011 21:40:55 +0000 (+0000)
Subject: Revert last change.
X-Git-Tag: releases/gcc-4.6.3~377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8d79f7a4487e2150df61ff51574a2ff47b555c3;p=thirdparty%2Fgcc.git

Revert last change.

From-SVN: r180665
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d3888bda0a33..296ac8c181e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,10 +1,5 @@
 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 74fd51d8a5bb..dc42e55012f9 100644
--- 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 *pa_output_bb (rtx *, int, rtx, int);
+extern const char *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 91c27bac09b7..d5780e5e6782 100644
--- 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 *
-pa_output_bb (rtx *operands ATTRIBUTE_UNUSED, int negated, rtx insn, int which)
+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 e8d5c45c3b59..1bd9f0b0ab64 100644
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -1507,7 +1507,7 @@
   ""
   "*
 {
-  return pa_output_bb (operands, 0, insn, 0);
+  return output_bb (operands, 0, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1535,7 +1535,7 @@
   "TARGET_64BIT"
   "*
 {
-  return pa_output_bb (operands, 0, insn, 0);
+  return output_bb (operands, 0, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1563,7 +1563,7 @@
   ""
   "*
 {
-  return pa_output_bb (operands, 1, insn, 0);
+  return output_bb (operands, 1, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1591,7 +1591,7 @@
   "TARGET_64BIT"
   "*
 {
-  return pa_output_bb (operands, 1, insn, 0);
+  return output_bb (operands, 1, insn, 0);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1619,7 +1619,7 @@
   ""
   "*
 {
-  return pa_output_bb (operands, 0, insn, 1);
+  return output_bb (operands, 0, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1647,7 +1647,7 @@
   "TARGET_64BIT"
   "*
 {
-  return pa_output_bb (operands, 0, insn, 1);
+  return output_bb (operands, 0, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1675,7 +1675,7 @@
   ""
   "*
 {
-  return pa_output_bb (operands, 1, insn, 1);
+  return output_bb (operands, 1, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")
@@ -1703,7 +1703,7 @@
   "TARGET_64BIT"
   "*
 {
-  return pa_output_bb (operands, 1, insn, 1);
+  return output_bb (operands, 1, insn, 1);
 }"
 [(set_attr "type" "cbranch")
  (set (attr "length")