From 819bfe0e14047c82148ba67fa9721abc206475bd Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 7 Dec 2010 15:42:44 +0000
Subject: [PATCH] * config/mcore/mcore.c Don't include assert.h.
(layout_mcore_frame, handle_structs_in_regs): Use gcc_assert.
* config/spu/spu.c: Don't include assert.h.
(spu_sms_res_mii): Use gcc_assert.
cp:
* rtti.c: Don't include assert.h.
java:
* jcf-parse.c: Don't include assert.h.
(java_parse_file): Use gcc_assert.
From-SVN: r167552
---
gcc/ChangeLog | 7 +++++++
gcc/config/mcore/mcore.c | 9 ++++-----
gcc/config/spu/spu.c | 5 ++---
gcc/cp/ChangeLog | 4 ++++
gcc/cp/rtti.c | 1 -
gcc/java/ChangeLog | 5 +++++
gcc/java/jcf-parse.c | 3 +--
7 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a684364fda96..f4b1643e6d8b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07 Joseph Myers <joseph@codesourcery.com>
+
+ * config/mcore/mcore.c Don't include assert.h.
+ (layout_mcore_frame, handle_structs_in_regs): Use gcc_assert.
+ * config/spu/spu.c: Don't include assert.h.
+ (spu_sms_res_mii): Use gcc_assert.
+
2010-12-07 Sebastian Pop <sebastian.pop@amd.com>
PR tree-optimization/42327
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index a66eb3cd162c..6227b174c39e 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -25,7 +25,6 @@
#include "rtl.h"
#include "tree.h"
#include "tm_p.h"
-#include "assert.h"
#include "mcore.h"
#include "regs.h"
#include "hard-reg-set.h"
@@ -1826,7 +1825,7 @@ layout_mcore_frame (struct mcore_frame * infp)
infp->local_growth = growths;
all -= step;
- assert (all == 0);
+ gcc_assert (all == 0);
/* Finish off if we need to do so. */
if (outbounds)
@@ -1904,8 +1903,8 @@ layout_mcore_frame (struct mcore_frame * infp)
/* Anything else that we've forgotten?, plus a few consistency checks. */
finish:
- assert (infp->reg_offset >= 0);
- assert (growths <= MAX_STACK_GROWS);
+ gcc_assert (infp->reg_offset >= 0);
+ gcc_assert (growths <= MAX_STACK_GROWS);
for (i = 0; i < growths; i++)
gcc_assert (!(infp->growth[i] % STACK_BYTES));
@@ -2772,7 +2771,7 @@ handle_structs_in_regs (enum machine_mode mode, const_tree type, int reg)
}
/* We assume here that NPARM_REGS == 6. The assert checks this. */
- assert (ARRAY_SIZE (arg_regs) == 6);
+ gcc_assert (ARRAY_SIZE (arg_regs) == 6);
rtvec = gen_rtvec (nregs, arg_regs[0], arg_regs[1], arg_regs[2],
arg_regs[3], arg_regs[4], arg_regs[5]);
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index bdea7e032e8f..bbe6eddde2a9 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -46,7 +46,6 @@
#include "cfglayout.h"
#include "sched-int.h"
#include "params.h"
-#include "assert.h"
#include "machmode.h"
#include "gimple.h"
#include "tm-constrs.h"
@@ -6946,8 +6945,8 @@ spu_sms_res_mii (struct ddg *g)
rtx insn = g->nodes[i].insn;
int p = get_pipe (insn) + 2;
- assert (p >= 0);
- assert (p < 4);
+ gcc_assert (p >= 0);
+ gcc_assert (p < 4);
t[p]++;
if (dump_file && INSN_P (insn))
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2bbd7e47425e..47a915aca3a1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-07 Joseph Myers <joseph@codesourcery.com>
+
+ * rtti.c: Don't include assert.h.
+
2010-12-07 Nathan Froyd <froydnj@codesourcery.com>
PR c++/45330
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 16b0db956cd3..0feaf07f851f 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "cp-tree.h"
#include "flags.h"
#include "output.h"
-#include "assert.h"
#include "convert.h"
#include "target.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 38df4b30a502..906a5a09e809 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07 Joseph Myers <joseph@codesourcery.com>
+
+ * jcf-parse.c: Don't include assert.h.
+ (java_parse_file): Use gcc_assert.
+
2010-12-03 Joseph Myers <joseph@codesourcery.com>
* lang.opt (static-libgcj): New option.
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 9166f311e999..d10791fe631d 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -38,7 +38,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "parse.h"
#include "ggc.h"
#include "debug.h"
-#include "assert.h"
#include "cgraph.h"
#include "vecprim.h"
#include "bitmap.h"
@@ -1855,7 +1854,7 @@ java_parse_file (void)
const char *resource_filename;
/* Only one resource file may be compiled at a time. */
- assert (VEC_length (tree, all_translation_units) == 1);
+ gcc_assert (VEC_length (tree, all_translation_units) == 1);
resource_filename
= IDENTIFIER_POINTER
--
GitLab