Module Name: src
Committed By: bouyer
Date: Thu Nov 28 22:28:30 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-mips.c
Log Message:
update for new binutils code our local patch to avoid warnings when macro are
used for loongson2f workarounds. Should fix mips64el kernel builds.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/binutils/dist/gas/config/tc-mips.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.12 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.13
--- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.12 Sun Sep 29 20:13:42 2013
+++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Thu Nov 28 22:28:30 2013
@@ -3700,10 +3700,14 @@ fix_loongson2f_jump (struct mips_cl_insn
macro_build (NULL, "and", "d,v,t", sreg, sreg, ATREG);
/* Hide these three instructions to avoid getting a ``macro expanded into
multiple instructions'' warning. */
- if (mips_relax.sequence != 2)
+ if (mips_relax.sequence != 2) {
mips_macro_warning.sizes[0] -= 3 * 4;
- if (mips_relax.sequence != 1)
+ mips_macro_warning.insns[0] -= 3;
+ }
+ if (mips_relax.sequence != 1) {
mips_macro_warning.sizes[1] -= 3 * 4;
+ mips_macro_warning.insns[1] -= 3;
+ }
}
}
@@ -4839,10 +4843,14 @@ macro_build_jrpatch (expressionS *ep, un
/* Hide these two instructions to avoid getting a ``macro expanded into
multiple instructions'' warning. */
- if (mips_relax.sequence != 2)
+ if (mips_relax.sequence != 2) {
mips_macro_warning.sizes[0] -= 2 * 4;
- if (mips_relax.sequence != 1)
+ mips_macro_warning.insns[0] -= 2;
+ }
+ if (mips_relax.sequence != 1) {
mips_macro_warning.sizes[1] -= 2 * 4;
+ mips_macro_warning.insns[0] -= 2;
+ }
}
/* Build an instruction created by a macro expansion. This is passed
