alpha.md (usegp): Cast the result of alpha_find_lo_sum_using_gp to enum attr_usegp.

	* config/alpha/alpha.md (usegp): Cast the result of
	alpha_find_lo_sum_using_gp to enum attr_usegp.
	* config/alpha/alpha.c (override_options): Remove end-of-structure
	marker element from cpu_table.  Use array size of cpu_table to handle
	-mcpu and -mtune options.
	(tls_symbolic_operand_type): Change 0 to TLS_MODEL_NONE.

From-SVN: r146912

4 files changed, 23 insertions, 14 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 487a2ff..aafe2ff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-28  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/alpha/alpha.md (usegp): Cast the result of
+	alpha_find_lo_sum_using_gp to enum attr_usegp.
+	* config/alpha/alpha.c (override_options): Remove end-of-structure
+	marker element from cpu_table.  Use array size of cpu_table to handle
+	-mcpu and -mtune options.
+	(tls_symbolic_operand_type): Change 0 to TLS_MODEL_NONE.
+
 2009-04-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* config.gcc (powerpc*-*-* | rs6000-*-*): Add
@@ -57,9 +66,9 @@
 
 2009-04-28  Paolo Bonzini  <bonzini@gnu.org>
 
-        * config/m32c/m32c.c (TARGET_PROMOTE_FUNCTION_RETURN,
-        m32c_promote_function_return, TARGET_PROMOTE_PROTOTYPES,
-        m32c_promote_prototypes): Delete.
+	* config/m32c/m32c.c (TARGET_PROMOTE_FUNCTION_RETURN,
+	m32c_promote_function_return, TARGET_PROMOTE_PROTOTYPES,
+	m32c_promote_prototypes): Delete.
 
 2009-04-28  Michael Matz  <matz@suse.de>
 
@@ -456,7 +465,7 @@
 	to above.
 
 2009-04-27  Richard Sandiford  <rdsandiford@googlemail.com>
-            Eric Botcazou  <ebotcazou@adacore.com>
+	    Eric Botcazou  <ebotcazou@adacore.com>
 
 	* resource.c (find_basic_block): Use BLOCK_FOR_INSN to look up
 	a label's basic block.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 931d0ea..8a7c313 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -275,10 +275,10 @@ override_options (void)
     { "ev6",	PROCESSOR_EV6, MASK_BWX|MASK_MAX|MASK_FIX },
     { "21264",	PROCESSOR_EV6, MASK_BWX|MASK_MAX|MASK_FIX },
     { "ev67",	PROCESSOR_EV6, MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX },
-    { "21264a",	PROCESSOR_EV6, MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX },
-    { 0, 0, 0 }
+    { "21264a",	PROCESSOR_EV6, MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX }
   };
 
+  int const ct_size = ARRAY_SIZE (cpu_table);
   int i;
 
   /* Unicos/Mk doesn't have shared libraries.  */
@@ -370,7 +370,7 @@ override_options (void)
 
   if (alpha_cpu_string)
     {
-      for (i = 0; cpu_table [i].name; i++)
+      for (i = 0; i < ct_size; i++)
 	if (! strcmp (alpha_cpu_string, cpu_table [i].name))
 	  {
 	    alpha_tune = alpha_cpu = cpu_table [i].processor;
@@ -378,19 +378,19 @@ override_options (void)
 	    target_flags |= cpu_table [i].flags;
 	    break;
 	  }
-      if (! cpu_table [i].name)
+      if (i == ct_size)
 	error ("bad value %qs for -mcpu switch", alpha_cpu_string);
     }
 
   if (alpha_tune_string)
     {
-      for (i = 0; cpu_table [i].name; i++)
+      for (i = 0; i < ct_size; i++)
 	if (! strcmp (alpha_tune_string, cpu_table [i].name))
 	  {
 	    alpha_tune = cpu_table [i].processor;
 	    break;
 	  }
-      if (! cpu_table [i].name)
+      if (i == ct_size)
 	error ("bad value %qs for -mcpu switch", alpha_tune_string);
     }
 
@@ -709,7 +709,7 @@ tls_symbolic_operand_type (rtx symbol)
   enum tls_model model;
 
   if (GET_CODE (symbol) != SYMBOL_REF)
-    return 0;
+    return TLS_MODEL_NONE;
   model = SYMBOL_REF_TLS_MODEL (symbol);
 
   /* Local-exec with a 64-bit size is the same code as initial-exec.  */
diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index 486551a9..543ed53 100644
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -169,7 +169,7 @@
   (cond [(eq_attr "type" "ldsym,jsr")
 	   (const_string "yes")
 	 (eq_attr "type" "ild,fld,ist,fst")
-	   (symbol_ref "alpha_find_lo_sum_using_gp(insn)")
+	   (symbol_ref "((enum attr_usegp) alpha_find_lo_sum_using_gp (insn))")
 	]
 	(const_string "no")))
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 024998b..859fe2e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -15,8 +15,8 @@
 
 2009-04-28  H.J. Lu  <hongjiu.lu@intel.com>
 
-	g++.dg/warn/pr35652.C: Removed.
-	gcc.dg/pr35652.c: Likewise.
+	* g++.dg/warn/pr35652.C: Removed.
+	* gcc.dg/pr35652.c: Likewise.
 
 2009-04-28  Alexander Monakov  <amonakov@ispras.ru>