Module Name: src Committed By: bouyer Date: Mon Aug 29 18:30:52 UTC 2011
Modified Files: src/external/gpl3/binutils/dist/gas/config: tc-mips.c Log Message: Hide instructions added by -mfix-loongson2f-jump in the same way as -mfix-loongson2f-btb, to avoid a gas warning "macro expanded into multiple instructions" (which cause GDIUM kernel build failure as it's built with -Wa,-mfix-loongson2f-jump -Wa,--fatal-warnings). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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.6 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.7 --- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.6 Sat Aug 27 13:19:39 2011 +++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Mon Aug 29 18:30:52 2011 @@ -2749,6 +2749,12 @@ ep.X_add_number = 0xffff; macro_build (&ep, "ori", "t,r,i", ATREG, ATREG, BFD_RELOC_LO16); 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) + mips_macro_warning.sizes[0] -= 3 * 4; + if (mips_relax.sequence != 1) + mips_macro_warning.sizes[1] -= 3 * 4; } }