aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lra-constraints.c2
-rw-r--r--gcc/lra-int.h8
3 files changed, 7 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cda585..1fd2aae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25 Vladimir Makarov <vmakarov@redhat.com>
+
+ * lra-int.h (lra_assert): Redefine it gcc_checking_assert.
+ * lra-constraints.c (check_and_process_move): Remove #if
+ ENABLE_ASSERT_CHECKING.
+
2012-10-26 Ralf Corsépius <ralf.corsepius@rtems.org>
* config/avr/rtems.h (TARGET_OS_CPP_BUILTINS): Remove
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 4b35726..f3729d2 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -1204,10 +1204,8 @@ check_and_process_move (bool *change_p, bool *sec_mem_p)
|| ((secondary_class != NO_REGS || sri.icode != CODE_FOR_nothing)
&& dclass != NO_REGS))
{
-#if ENABLE_ASSERT_CHECKING
enum reg_class old_sclass = secondary_class;
secondary_reload_info old_sri = sri;
-#endif
sri.prev_sri = NULL;
sri.icode = CODE_FOR_nothing;
diff --git a/gcc/lra-int.h b/gcc/lra-int.h
index d00cc12..f88145b 100644
--- a/gcc/lra-int.h
+++ b/gcc/lra-int.h
@@ -25,13 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "insn-codes.h"
-#ifdef ENABLE_CHECKING
-#define lra_assert(c) gcc_assert (c)
-#else
-/* Always define and include C, so that warnings for empty body in an
- ‘if’ statement and unused variable do not occur. */
-#define lra_assert(c) ((void)(0 && (c)))
-#endif
+#define lra_assert(c) gcc_checking_assert (c)
/* The parameter used to prevent infinite reloading for an insn. Each
insn operands might require a reload and, if it is a memory, its