From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Sat, 18 May 2013 07:58:55 +0000 (+0000)
Subject: recog.h (Recog_data): Rename to...
X-Git-Tag: releases/gcc-4.9.0~5822
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8da2e0598d1df01f58740c81a39cc98cf43786d3;p=thirdparty%2Fgcc.git

recog.h (Recog_data): Rename to...

gcc/
	* recog.h (Recog_data): Rename to...
	(recog_data_d): ...this.
	(recog_data): Update accordingly.
	* recog.c (recog_data): Likewise.
	* reload.c (save_recog_data): Likewise.
	* config/picochip/picochip.c (picochip_saved_recog_data): Likewise.
	(picochip_save_recog_data, picochip_restore_recog_data): Likewise.

From-SVN: r199050
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d6eab5f2ef17..0649452aacf1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* recog.h (Recog_data): Rename to...
+	(recog_data_d): ...this.
+	(recog_data): Update accordingly.
+	* recog.c (recog_data): Likewise.
+	* reload.c (save_recog_data): Likewise.
+	* config/picochip/picochip.c (picochip_saved_recog_data): Likewise.
+	(picochip_save_recog_data, picochip_restore_recog_data): Likewise.
+
 2013-05-17  Julian Brown  <julian@codesourcery.com>
 
 	* gcse.c (compute_ld_motion_mems): If a non-simple MEM is
diff --git a/gcc/config/picochip/picochip.c b/gcc/config/picochip/picochip.c
index 56722fa016ce..e5d30c6feca6 100644
--- a/gcc/config/picochip/picochip.c
+++ b/gcc/config/picochip/picochip.c
@@ -187,7 +187,7 @@ struct vliw_state picochip_current_vliw_state;
 
 /* Save/restore recog_data. */
 static int picochip_saved_which_alternative;
-static struct Recog_data picochip_saved_recog_data;
+static struct recog_data_d picochip_saved_recog_data;
 
 /* Determine which ALU to use for the instruction in
    picochip_current_prescan_insn. */
@@ -3150,7 +3150,7 @@ picochip_save_recog_data (void)
 {
   picochip_saved_which_alternative = which_alternative;
   memcpy (&picochip_saved_recog_data, &recog_data,
-	  sizeof (struct Recog_data));
+	  sizeof (struct recog_data_d));
 }
 
 /* Restore some of the contents of global variable recog_data. */
@@ -3159,7 +3159,7 @@ picochip_restore_recog_data (void)
 {
   which_alternative = picochip_saved_which_alternative;
   memcpy (&recog_data, &picochip_saved_recog_data,
-	  sizeof (struct Recog_data));
+	  sizeof (struct recog_data_d));
 }
 
 /* Ensure that no var tracking notes are emitted in the middle of a
diff --git a/gcc/recog.c b/gcc/recog.c
index dad7ee0dfb21..5356b8dd776f 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -70,7 +70,7 @@ static rtx split_insn (rtx);
 
 int volatile_ok;
 
-struct Recog_data recog_data;
+struct recog_data_d recog_data;
 
 /* Contains a vector of operand_alternative structures for every operand.
    Set up by preprocess_constraints.  */
diff --git a/gcc/recog.h b/gcc/recog.h
index 1bb0738b46fd..71e801edb2de 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -179,7 +179,7 @@ extern int which_alternative;
 
 /* The following vectors hold the results from insn_extract.  */
 
-struct Recog_data
+struct recog_data_d
 {
   /* It is very tempting to make the 5 operand related arrays into a
      structure and index on that.  However, to be source compatible
@@ -245,7 +245,7 @@ struct Recog_data
   rtx insn;
 };
 
-extern struct Recog_data recog_data;
+extern struct recog_data_d recog_data;
 
 /* Contains a vector of operand_alternative structures for every operand.
    Set up by preprocess_constraints.  */
diff --git a/gcc/reload.c b/gcc/reload.c
index 959d143b8766..8733ff33467c 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -895,7 +895,7 @@ can_reload_into (rtx in, int regno, enum machine_mode mode)
 {
   rtx dst, test_insn;
   int r = 0;
-  struct Recog_data save_recog_data;
+  struct recog_data_d save_recog_data;
 
   /* For matching constraints, we often get notional input reloads where
      we want to use the original register as the reload register.  I.e.