* [gentoo-commits] gentoo commit in src/patchsets/gcc/4.5.1/gentoo: 95_all_arm-pr43440.patch README.history
@ 2010-08-19 15:44 Luca Barbato (lu_zero)
0 siblings, 0 replies; 2+ messages in thread
From: Luca Barbato (lu_zero) @ 2010-08-19 15:44 UTC (permalink / raw
To: gentoo-commits
lu_zero 10/08/19 15:44:08
Modified: README.history
Added: 95_all_arm-pr43440.patch
Log:
Forward port arm clobber list fixes from 4.4.4
Revision Changes Path
1.3 src/patchsets/gcc/4.5.1/gentoo/README.history
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?r1=1.2&r2=1.3
Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.history 7 Aug 2010 22:10:15 -0000 1.2
+++ README.history 19 Aug 2010 15:44:08 -0000 1.3
@@ -1,3 +1,4 @@
+ + 95_all_arm-pr43440.patch
1.0 07.08.2010
+ 00_all_gcc-4.1-alpha-mieee-default.patch
+ 01_all_gcc-4.1-alpha-asm-mcpu.patch
1.1 src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch?rev=1.1&content-type=text/plain
Index: 95_all_arm-pr43440.patch
===================================================================
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43440
diff -urN gcc-4.4.4.orig/gcc/config/arm/aout.h gcc-4.4.4/gcc/config/arm/aout.h
--- gcc-4.4.4.orig/gcc/config/arm/aout.h 2009-02-20 16:20:38.000000000 +0100
+++ gcc-4.4.4/gcc/config/arm/aout.h 2010-08-18 14:37:50.000000000 +0200
@@ -163,34 +163,49 @@
{"mvdx12", 39}, \
{"mvdx13", 40}, \
{"mvdx14", 41}, \
- {"mvdx15", 42}, \
- {"d0", 63}, {"q0", 63}, \
- {"d1", 65}, \
- {"d2", 67}, {"q1", 67}, \
- {"d3", 69}, \
- {"d4", 71}, {"q2", 71}, \
- {"d5", 73}, \
- {"d6", 75}, {"q3", 75}, \
- {"d7", 77}, \
- {"d8", 79}, {"q4", 79}, \
- {"d9", 81}, \
- {"d10", 83}, {"q5", 83}, \
- {"d11", 85}, \
- {"d12", 87}, {"q6", 87}, \
- {"d13", 89}, \
- {"d14", 91}, {"q7", 91}, \
- {"d15", 93}, \
- {"q8", 95}, \
- {"q9", 99}, \
- {"q10", 103}, \
- {"q11", 107}, \
- {"q12", 111}, \
- {"q13", 115}, \
- {"q14", 119}, \
- {"q15", 123} \
+ {"mvdx15", 42} \
}
#endif
+#ifndef OVERLAPPING_REGISTER_NAMES
+#define OVERLAPPING_REGISTER_NAMES \
+{ \
+ {"d0", 63, 2}, \
+ {"d1", 65, 2}, \
+ {"d2", 67, 2}, \
+ {"d3", 69, 2}, \
+ {"d4", 71, 2}, \
+ {"d5", 73, 2}, \
+ {"d6", 75, 2}, \
+ {"d7", 77, 2}, \
+ {"d8", 79, 2}, \
+ {"d9", 81, 2}, \
+ {"d10", 83, 2}, \
+ {"d11", 85, 2}, \
+ {"d12", 87, 2}, \
+ {"d13", 89, 2}, \
+ {"d14", 91, 2}, \
+ {"d15", 93, 2}, \
+ {"q0", 63, 4}, \
+ {"q1", 67, 4}, \
+ {"q2", 71, 4}, \
+ {"q3", 75, 4}, \
+ {"q4", 79, 4}, \
+ {"q5", 83, 4}, \
+ {"q6", 87, 4}, \
+ {"q7", 91, 4}, \
+ {"q8", 95, 4}, \
+ {"q9", 99, 4}, \
+ {"q10", 103, 4}, \
+ {"q11", 107, 4}, \
+ {"q12", 111, 4}, \
+ {"q13", 115, 4}, \
+ {"q14", 119, 4}, \
+ {"q15", 123, 4} \
+}
+#endif
+
+
#ifndef NO_DOLLAR_IN_LABEL
#define NO_DOLLAR_IN_LABEL 1
#endif
diff -urN gcc-4.4.4.orig/gcc/output.h gcc-4.4.4/gcc/output.h
--- gcc-4.4.4.orig/gcc/output.h 2008-11-22 09:22:52.000000000 +0100
+++ gcc-4.4.4/gcc/output.h 2010-08-18 14:39:23.000000000 +0200
@@ -169,6 +169,11 @@
Prefixes such as % are optional. */
extern int decode_reg_name (const char *);
+/* Similar to decode_reg_name, but takes an extra parameter that is a
+ pointer to the number of (internal) registers described by the
+ external name. */
+extern int decode_reg_name_and_count (const char *, int *);
+
extern void assemble_alias (tree, tree);
extern void default_assemble_visibility (tree, int);
diff -urN gcc-4.4.4.orig/gcc/reginfo.c gcc-4.4.4/gcc/reginfo.c
--- gcc-4.4.4.orig/gcc/reginfo.c 2010-04-19 12:06:13.000000000 +0200
+++ gcc-4.4.4/gcc/reginfo.c 2010-08-18 14:44:32.000000000 +0200
@@ -800,39 +800,44 @@
fix_register (const char *name, int fixed, int call_used)
{
int i;
+ int reg, nregs;
/* Decode the name and update the primary form of
the register info. */
-
- if ((i = decode_reg_name (name)) >= 0)
+ if ((reg = decode_reg_name_and_count (name, &nregs)) >= 0)
{
- if ((i == STACK_POINTER_REGNUM
+ gcc_assert (nregs >= 1);
+ for (i = reg; i < reg + nregs; i++)
+ {
+ if ((i == STACK_POINTER_REGNUM
#ifdef HARD_FRAME_POINTER_REGNUM
- || i == HARD_FRAME_POINTER_REGNUM
+ || i == HARD_FRAME_POINTER_REGNUM
#else
- || i == FRAME_POINTER_REGNUM
+ || i == FRAME_POINTER_REGNUM
#endif
- )
- && (fixed == 0 || call_used == 0))
- {
- static const char * const what_option[2][2] = {
- { "call-saved", "call-used" },
- { "no-such-option", "fixed" }};
+ )
+ && (fixed == 0 || call_used == 0))
+ {
+ static const char * const what_option[2][2] = {
+ { "call-saved", "call-used" },
+ { "no-such-option", "fixed" }};
- error ("can't use '%s' as a %s register", name,
- what_option[fixed][call_used]);
- }
- else
- {
- fixed_regs[i] = fixed;
- call_used_regs[i] = call_used;
+ error ("can't use '%s' as a %s register", name,
+ what_option[fixed][call_used]);
+ }
+ else
+ {
+ fixed_regs[i] = fixed;
+ call_used_regs[i] = call_used;
#ifdef CALL_REALLY_USED_REGISTERS
- if (fixed == 0)
- call_really_used_regs[i] = call_used;
+ if (fixed == 0)
+ call_really_used_regs[i] = call_used;
#endif
- }
- }
- else
+ }
+ }
+ }
+ else
+
{
warning (0, "unknown register name: %s", name);
}
diff -urN gcc-4.4.4.orig/gcc/stmt.c gcc-4.4.4/gcc/stmt.c
--- gcc-4.4.4.orig/gcc/stmt.c 2010-08-18 13:10:29.000000000 +0200
+++ gcc-4.4.4/gcc/stmt.c 2010-08-18 14:59:56.000000000 +0200
@@ -681,13 +681,14 @@
for (tail = clobbers; tail; tail = TREE_CHAIN (tail))
{
const char *regname;
+ int nregs;
if (TREE_VALUE (tail) == error_mark_node)
return;
regname = TREE_STRING_POINTER (TREE_VALUE (tail));
- i = decode_reg_name (regname);
- if (i >= 0 || i == -4)
+ i = decode_reg_name_and_count (regname, &nregs);
+ if (i == -4)
++nclobbers;
else if (i == -2)
error ("unknown register name %qs in %<asm%>", regname);
@@ -695,14 +696,21 @@
/* Mark clobbered registers. */
if (i >= 0)
{
- /* Clobbering the PIC register is an error. */
- if (i == (int) PIC_OFFSET_TABLE_REGNUM)
- {
- error ("PIC register %qs clobbered in %<asm%>", regname);
- return;
- }
+ int reg;
- SET_HARD_REG_BIT (clobbered_regs, i);
+ for (reg = i; reg < i + nregs; reg++)
+ {
+ ++nclobbers;
+
+ /* Clobbering the PIC register is an error. */
+ if (reg == (int) PIC_OFFSET_TABLE_REGNUM)
+ {
+ error ("PIC register clobbered by %qs in %<asm%>", regname);
+ return;
+ }
+
+ SET_HARD_REG_BIT (clobbered_regs, reg);
+ }
}
}
@@ -1012,8 +1020,9 @@
for (tail = clobbers; tail; tail = TREE_CHAIN (tail))
{
const char *regname = TREE_STRING_POINTER (TREE_VALUE (tail));
- int j = decode_reg_name (regname);
- rtx clobbered_reg;
+ int reg, nregs;
+ int j = decode_reg_name_and_count (regname, &nregs);
+ rtx clobbered_reg;
if (j < 0)
{
@@ -1033,31 +1042,40 @@
/* Ignore unknown register, error already signaled. */
continue;
}
-
- /* Use QImode since that's guaranteed to clobber just one reg. */
- clobbered_reg = gen_rtx_REG (QImode, j);
-
- /* Do sanity check for overlap between clobbers and respectively
- input and outputs that hasn't been handled. Such overlap
- should have been detected and reported above. */
- if (!clobber_conflict_found)
- {
- int opno;
-
- /* We test the old body (obody) contents to avoid tripping
- over the under-construction body. */
- for (opno = 0; opno < noutputs; opno++)
- if (reg_overlap_mentioned_p (clobbered_reg, output_rtx[opno]))
- internal_error ("asm clobber conflict with output operand");
-
- for (opno = 0; opno < ninputs - ninout; opno++)
- if (reg_overlap_mentioned_p (clobbered_reg,
- ASM_OPERANDS_INPUT (obody, opno)))
- internal_error ("asm clobber conflict with input operand");
+
+ for (reg = j; reg < j + nregs; reg++)
+ {
+ /* Use QImode since that's guaranteed to clobber just
+ * one reg. */
+ clobbered_reg = gen_rtx_REG (QImode, reg);
+
+ /* Do sanity check for overlap between clobbers and
+ respectively input and outputs that hasn't been
+ handled. Such overlap should have been detected and
+ reported above. */
+ if (!clobber_conflict_found)
+ {
+ int opno;
+
+ /* We test the old body (obody) contents to avoid
+ tripping over the under-construction body. */
+ for (opno = 0; opno < noutputs; opno++)
+ if (reg_overlap_mentioned_p (clobbered_reg,
+ output_rtx[opno]))
+ internal_error
+ ("asm clobber conflict with output operand");
+
+ for (opno = 0; opno < ninputs - ninout; opno++)
+ if (reg_overlap_mentioned_p (clobbered_reg,
+ ASM_OPERANDS_INPUT (obody,
+ opno)))
+ internal_error
+ ("asm clobber conflict with input operand");
+ }
+
+ XVECEXP (body, 0, i++)
+ = gen_rtx_CLOBBER (VOIDmode, clobbered_reg);
}
-
- XVECEXP (body, 0, i++)
- = gen_rtx_CLOBBER (VOIDmode, clobbered_reg);
}
emit_insn (body);
diff -urN gcc-4.4.4.orig/gcc/varasm.c gcc-4.4.4/gcc/varasm.c
--- gcc-4.4.4.orig/gcc/varasm.c 2010-01-20 12:27:49.000000000 +0100
+++ gcc-4.4.4/gcc/varasm.c 2010-08-18 15:04:12.000000000 +0200
@@ -1031,8 +1031,11 @@
Prefixes such as % are optional. */
int
-decode_reg_name (const char *asmspec)
+decode_reg_name_and_count (const char *asmspec, int *pnregs)
{
+ /* Presume just one register is clobbered. */
+ *pnregs = 1;
+
if (asmspec != 0)
{
int i;
@@ -1058,6 +1061,25 @@
&& ! strcmp (asmspec, strip_reg_name (reg_names[i])))
return i;
+#ifdef OVERLAPPING_REGISTER_NAMES
+ {
+ static const struct
+ {
+ const char *const name;
+ const int number;
+ const int nregs;
+ } table[] = OVERLAPPING_REGISTER_NAMES;
+
+ for (i = 0; i < (int) ARRAY_SIZE (table); i++)
+ if (table[i].name[0]
+ && ! strcmp (asmspec, table[i].name))
+ {
+ *pnregs = table[i].nregs;
+ return table[i].number;
+ }
+ }
+#endif /* OVERLAPPING_REGISTER_NAMES */
+
#ifdef ADDITIONAL_REGISTER_NAMES
{
static const struct { const char *const name; const int number; } table[]
@@ -1081,6 +1103,15 @@
return -1;
}
+
+int
+decode_reg_name (const char *name)
+{
+ int count;
+ return decode_reg_name_and_count (name, &count);
+}
+
+
\f
/* Return true if DECL's initializer is suitable for a BSS section. */
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo commit in src/patchsets/gcc/4.5.1/gentoo: 95_all_arm-pr43440.patch README.history
@ 2010-09-04 2:23 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-09-04 2:23 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/09/04 02:23:04
Modified: 95_all_arm-pr43440.patch README.history
Log:
Clean up patch headers.
Revision Changes Path
1.2 src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch?r1=1.1&r2=1.2
Index: 95_all_arm-pr43440.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.5.1/gentoo/95_all_arm-pr43440.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 95_all_arm-pr43440.patch 19 Aug 2010 15:44:08 -0000 1.1
+++ 95_all_arm-pr43440.patch 4 Sep 2010 02:23:04 -0000 1.2
@@ -1,8 +1,7 @@
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43440
-diff -urN gcc-4.4.4.orig/gcc/config/arm/aout.h gcc-4.4.4/gcc/config/arm/aout.h
---- gcc-4.4.4.orig/gcc/config/arm/aout.h 2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.4/gcc/config/arm/aout.h 2010-08-18 14:37:50.000000000 +0200
+--- gcc-4.4.4.orig/gcc/config/arm/aout.h
++++ gcc-4.4.4/gcc/config/arm/aout.h
@@ -163,34 +163,49 @@
{"mvdx12", 39}, \
{"mvdx13", 40}, \
@@ -78,9 +77,8 @@
#ifndef NO_DOLLAR_IN_LABEL
#define NO_DOLLAR_IN_LABEL 1
#endif
-diff -urN gcc-4.4.4.orig/gcc/output.h gcc-4.4.4/gcc/output.h
---- gcc-4.4.4.orig/gcc/output.h 2008-11-22 09:22:52.000000000 +0100
-+++ gcc-4.4.4/gcc/output.h 2010-08-18 14:39:23.000000000 +0200
+--- gcc-4.4.4.orig/gcc/output.h
++++ gcc-4.4.4/gcc/output.h
@@ -169,6 +169,11 @@
Prefixes such as % are optional. */
extern int decode_reg_name (const char *);
@@ -93,9 +91,8 @@
extern void assemble_alias (tree, tree);
extern void default_assemble_visibility (tree, int);
-diff -urN gcc-4.4.4.orig/gcc/reginfo.c gcc-4.4.4/gcc/reginfo.c
---- gcc-4.4.4.orig/gcc/reginfo.c 2010-04-19 12:06:13.000000000 +0200
-+++ gcc-4.4.4/gcc/reginfo.c 2010-08-18 14:44:32.000000000 +0200
+--- gcc-4.4.4.orig/gcc/reginfo.c
++++ gcc-4.4.4/gcc/reginfo.c
@@ -800,39 +800,44 @@
fix_register (const char *name, int fixed, int call_used)
{
@@ -164,9 +161,8 @@
{
warning (0, "unknown register name: %s", name);
}
-diff -urN gcc-4.4.4.orig/gcc/stmt.c gcc-4.4.4/gcc/stmt.c
---- gcc-4.4.4.orig/gcc/stmt.c 2010-08-18 13:10:29.000000000 +0200
-+++ gcc-4.4.4/gcc/stmt.c 2010-08-18 14:59:56.000000000 +0200
+--- gcc-4.4.4.orig/gcc/stmt.c
++++ gcc-4.4.4/gcc/stmt.c
@@ -681,13 +681,14 @@
for (tail = clobbers; tail; tail = TREE_CHAIN (tail))
{
@@ -290,9 +286,8 @@
}
emit_insn (body);
-diff -urN gcc-4.4.4.orig/gcc/varasm.c gcc-4.4.4/gcc/varasm.c
---- gcc-4.4.4.orig/gcc/varasm.c 2010-01-20 12:27:49.000000000 +0100
-+++ gcc-4.4.4/gcc/varasm.c 2010-08-18 15:04:12.000000000 +0200
+--- gcc-4.4.4.orig/gcc/varasm.c
++++ gcc-4.4.4/gcc/varasm.c
@@ -1031,8 +1031,11 @@
Prefixes such as % are optional. */
1.4 src/patchsets/gcc/4.5.1/gentoo/README.history
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history?r1=1.3&r2=1.4
Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.5.1/gentoo/README.history,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.history 19 Aug 2010 15:44:08 -0000 1.3
+++ README.history 4 Sep 2010 02:23:04 -0000 1.4
@@ -1,4 +1,5 @@
- + 95_all_arm-pr43440.patch
+ + 95_all_arm-pr43440.patch
+
1.0 07.08.2010
+ 00_all_gcc-4.1-alpha-mieee-default.patch
+ 01_all_gcc-4.1-alpha-asm-mcpu.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-04 2:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-19 15:44 [gentoo-commits] gentoo commit in src/patchsets/gcc/4.5.1/gentoo: 95_all_arm-pr43440.patch README.history Luca Barbato (lu_zero)
-- strict thread matches above, loose matches on Subject: below --
2010-09-04 2:23 Ryan Hill (dirtyepic)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox