make sure this is committedibm/git280

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ibm/git280@268429 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 5 insertions, 38 deletions

diff --git a/gcc/config/rs6000/rs6000-p9indexing.c b/gcc/config/rs6000/rs6000-p9indexing.c
index bcf523a21fc..3eb713b96d1 100644
--- a/gcc/config/rs6000/rs6000-p9indexing.c
+++ b/gcc/config/rs6000/rs6000-p9indexing.c
@@ -46,10 +46,6 @@
 
 #include "genrtl.h"
 
-extern bool rs6000_debug_legitimate_address_p (machine_mode, rtx, bool);
-
-
-
 /* This pass transforms array indexing expressions from a form that
    favors selection of X-form instructions into a form that favors
    selection of D-form instructions.
diff --git a/gcc/config/rs6000/rs6000-passes.def b/gcc/config/rs6000/rs6000-passes.def
index 6c50c6898bf..ed2d20e6b4b 100644
--- a/gcc/config/rs6000/rs6000-passes.def
+++ b/gcc/config/rs6000/rs6000-passes.def
@@ -1,4 +1,4 @@
-/* Description of target passes for rs6000
+a/* Description of target passes for rs6000
    Copyright (C) 2016-2018 Free Software Foundation, Inc.
 
 This file is part of GCC.
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index da5ecf04b5a..c90bad8aaff 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -42,7 +42,6 @@ extern bool mem_operand_gpr (rtx, machine_mode);
 extern bool mem_operand_ds_form (rtx, machine_mode);
 extern bool toc_relative_expr_p (const_rtx, bool, const_rtx *, const_rtx *);
 extern void validate_condition_mode (enum rtx_code, machine_mode);
-extern bool rs6000_legitimate_address_p (machine_mode, rtx, bool);
 extern bool legitimate_constant_pool_address_p (const_rtx, machine_mode,
 						bool);
 extern bool legitimate_indirect_address_p (rtx, int);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0960350d82f..9e34a4f9505 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1326,8 +1326,7 @@ static const struct rs6000_builtin_info_type rs6000_builtin_info[] =
 static tree (*rs6000_veclib_handler) (combined_fn, tree, tree);
 
 
-/* kelvin says this was static.  */
-bool rs6000_debug_legitimate_address_p (machine_mode, rtx, bool);
+static bool rs6000_debug_legitimate_address_p (machine_mode, rtx, bool);
 static struct machine_function * rs6000_init_machine_status (void);
 static int rs6000_ra_ever_killed (void);
 static tree rs6000_handle_longcall_attribute (tree *, tree, tree, int, bool *);
@@ -9158,7 +9157,7 @@ rs6000_debug_legitimize_reload_address (rtx x, machine_mode mode,
    32-bit DImode, TImode, TFmode, TDmode), indexed addressing cannot be used
    because adjacent memory cells are accessed by adding word-sized offsets
    during assembly output.  */
-bool
+static bool
 rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
 {
   bool reg_offset_p = reg_offset_addressing_ok_p (mode);
@@ -9183,16 +9182,12 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
   /* Handle restricted vector d-form offsets in ISA 3.0.  */
   if (quad_offset_p)
     {
-      if (dump_file) {
-	fprintf (dump_file, "checking quad_address_p, x: ");
-	print_inline_rtx (dump_file, x, 2);
-	fprintf (dump_file, "\n");
-      }
       if (quad_address_p (x, mode, reg_ok_strict))
 	return 1;
     }
   else if (virtual_stack_registers_memory_p (x))
     return 1;
+
   else if (reg_offset_p)
     {
       if (legitimate_small_data_p (mode, x))
@@ -9202,10 +9197,6 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
 	return 1;
     }
 
-  if (dump_file) {
-    fprintf (dump_file, "checking TImode\n");
-  }
-
   /* For TImode, if we have TImode in VSX registers, only allow register
      indirect addresses.  This will allow the values to go in either GPRs
      or VSX registers without reloading.  The vector types would tend to
@@ -9226,11 +9217,6 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
 	  || XEXP (x, 0) == arg_pointer_rtx)
       && GET_CODE (XEXP (x, 1)) == CONST_INT)
     return 1;
-
-  if (dump_file) {
-    fprintf (dump_file, "attempting rs6000_legitimate_offset_address_p\n");
-  }
-
   if (rs6000_legitimate_offset_address_p (mode, x, reg_ok_strict, false))
     return 1;
   if (!FLOAT128_2REG_P (mode)
@@ -9259,8 +9245,7 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
 }
 
 /* Debug version of rs6000_legitimate_address_p.  */
-/* kelvin says this was static */
-bool
+static bool
 rs6000_debug_legitimate_address_p (machine_mode mode, rtx x,
 				   bool reg_ok_strict)
 {
@@ -9275,19 +9260,6 @@ rs6000_debug_legitimate_address_p (machine_mode mode, rtx x,
 	   GET_RTX_NAME (GET_CODE (x)));
   debug_rtx (x);
 
-  if (dump_file) {
-    fprintf (dump_file,
-	     "\nrs6000_legitimate_address_p: return = %s, mode = %s, "
-	     "strict = %d, reload = %s, code = %s\n",
-	     ret ? "true" : "false",
-	     GET_MODE_NAME (mode),
-	     reg_ok_strict,
-	     (reload_completed ? "after" : "before"),
-	     GET_RTX_NAME (GET_CODE (x)));
-    print_inline_rtx (dump_file, x, 2);
-    fprintf (dump_file, "\n");
-  }
-
   return ret;
 }