re PR lto/48431 (patch to fix a compile error in lto-plugin.c when using older C compilers)

2011-04-05  Richard Guenther  <rguenther@suse.de>

	PR bootstrap/48431
	* lto-plugin.c (claim_file_handler): Do not declare vars in code.

From-SVN: r171982
This commit is contained in:
Richard Guenther 2011-04-05 12:11:08 +00:00 committed by Richard Biener
parent 1ed13f83ff
commit 3b8c1a3f49
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2011-04-05 Richard Guenther <rguenther@suse.de>
PR bootstrap/48431
* lto-plugin.c (claim_file_handler): Do not declare vars in code.
2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate. * Makefile.in: Regenerate.

View File

@ -851,11 +851,11 @@ claim_file_handler (const struct ld_plugin_input_file *file, int *claimed)
/* We pass the offset of the actual file, not the archive header. /* We pass the offset of the actual file, not the archive header.
Can't use PRIx64, because that's C99, so we have to print the Can't use PRIx64, because that's C99, so we have to print the
64-bit hex int as two 32-bit ones. */ 64-bit hex int as two 32-bit ones. */
int lo, hi; int lo, hi, t;
lo = file->offset & 0xffffffff; lo = file->offset & 0xffffffff;
hi = ((int64_t)file->offset >> 32) & 0xffffffff; hi = ((int64_t)file->offset >> 32) & 0xffffffff;
int t = hi ? asprintf (&objname, "%s@0x%x%08x", file->name, lo, hi) t = hi ? asprintf (&objname, "%s@0x%x%08x", file->name, lo, hi)
: asprintf (&objname, "%s@0x%x", file->name, lo); : asprintf (&objname, "%s@0x%x", file->name, lo);
check (t >= 0, LDPL_FATAL, "asprintf failed"); check (t >= 0, LDPL_FATAL, "asprintf failed");
lto_file.name = objname; lto_file.name = objname;
} }