From 1ef9e36cf182a1c89d4d517439cb2340e559de76 Mon Sep 17 00:00:00 2001
From: Diego Novillo <dnovillo@google.com>
Date: Wed, 14 Nov 2012 11:55:16 -0500
Subject: ia64 fixes.

---
 gcc/config/ia64/ia64.c | 27 ++++++++++++++-------------
 gcc/haifa-sched.c      |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 29e589e43f9..9a7528f346a 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -5937,21 +5937,22 @@ ia64_option_override (void)
 {
   unsigned int i;
   cl_deferred_option *opt;
-  vec<cl_deferred_option> vec
-    = (vec<cl_deferred_option> ) ia64_deferred_options;
+  vec<cl_deferred_option> *v
+    = (vec<cl_deferred_option> *) ia64_deferred_options;
 
-  FOR_EACH_VEC_ELT (vec, i, opt)
-    {
-      switch (opt->opt_index)
-	{
-	case OPT_mfixed_range_:
-	  fix_range (opt->arg);
-	  break;
+  if (v)
+    FOR_EACH_VEC_ELT (*v, i, opt)
+      {
+	switch (opt->opt_index)
+	  {
+	  case OPT_mfixed_range_:
+	    fix_range (opt->arg);
+	    break;
 
-	default:
-	  gcc_unreachable ();
-	}
-    }
+	  default:
+	    gcc_unreachable ();
+	  }
+      }
 
   if (TARGET_AUTO_PIC)
     target_flags |= MASK_CONST_GP;
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 5a68ba53a12..48e15f8875b 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -8184,7 +8184,7 @@ move_succs (vec<edge, va_gc> **succsp, basic_block to)
   edge e;
   edge_iterator ei;
 
-  gcc_assert (!to->succs == 0);
+  gcc_assert (to->succs == 0);
 
   to->succs = *succsp;
 
-- 
cgit v1.2.1