svn commit: r234855 - head/contrib/gcc/config/mips
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Mon Apr 30 22:46:10 UTC 2012
Author: gonzo
Date: Mon Apr 30 22:46:09 2012
New Revision: 234855
URL: http://svn.freebsd.org/changeset/base/234855
Log:
Unbreak jemalloc build with MALLOC_PRODUCTION set. New jemalloc version
uncovered MIPS-related gcc bug described in
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33256
The patch was obtained from r128198 in gcc-4_1-branch, which is GPLv2,
so it's OK to merge it.
Modified:
head/contrib/gcc/config/mips/mips.c
Modified: head/contrib/gcc/config/mips/mips.c
==============================================================================
--- head/contrib/gcc/config/mips/mips.c Mon Apr 30 22:06:47 2012 (r234854)
+++ head/contrib/gcc/config/mips/mips.c Mon Apr 30 22:46:09 2012 (r234855)
@@ -1297,6 +1297,20 @@ mips_split_const (rtx x, rtx *base, HOST
*base = x;
}
+/* Classify symbolic expression X, given that it appears in context
+ CONTEXT. */
+
+static enum mips_symbol_type
+mips_classify_symbolic_expression (rtx x)
+{
+ HOST_WIDE_INT offset;
+
+ mips_split_const (x, &x, &offset);
+ if (UNSPEC_ADDRESS_P (x))
+ return UNSPEC_ADDRESS_TYPE (x);
+
+ return mips_classify_symbol (x);
+}
/* Return true if SYMBOL is a SYMBOL_REF and OFFSET + SYMBOL points
to the same object as SYMBOL, or to the same object_block. */
@@ -1534,8 +1548,17 @@ mips_classify_address (struct mips_addre
info->type = ADDRESS_LO_SUM;
info->reg = XEXP (x, 0);
info->offset = XEXP (x, 1);
+ /* We have to trust the creator of the LO_SUM to do something vaguely
+ sane. Target-independent code that creates a LO_SUM should also
+ create and verify the matching HIGH. Target-independent code that
+ adds an offset to a LO_SUM must prove that the offset will not
+ induce a carry. Failure to do either of these things would be
+ a bug, and we are not required to check for it here. The MIPS
+ backend itself should only create LO_SUMs for valid symbolic
+ constants, with the high part being either a HIGH or a copy
+ of _gp. */
+ info->symbol_type = mips_classify_symbolic_expression (info->offset);
return (mips_valid_base_register_p (info->reg, mode, strict)
- && mips_symbolic_constant_p (info->offset, &info->symbol_type)
&& mips_symbolic_address_p (info->symbol_type, mode)
&& mips_lo_relocs[info->symbol_type] != 0);
@@ -5671,7 +5694,8 @@ print_operand_reloc (FILE *file, rtx op,
rtx base;
HOST_WIDE_INT offset;
- if (!mips_symbolic_constant_p (op, &symbol_type) || relocs[symbol_type] == 0)
+ symbol_type = mips_classify_symbolic_expression (op);
+ if (relocs[symbol_type] == 0)
fatal_insn ("PRINT_OPERAND, invalid operand for relocation", op);
/* If OP uses an UNSPEC address, we want to print the inner symbol. */
More information about the svn-src-all
mailing list