summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2011-04-05 12:13:27 +0000
committerrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2011-04-05 12:13:27 +0000
commit56a8ff0c197b4b0f917e3b50ac0dd3ed26f300c3 (patch)
tree521af0981dcc253b97b9d81e8ae071ba488e9eb7
parent7a43b3a2e2c0d9cf557ac45577cc42c6d72e0065 (diff)
downloadgcc-56a8ff0c197b4b0f917e3b50ac0dd3ed26f300c3.tar.gz
2011-04-05 Richard Guenther <rguenther@suse.de>
PR bootstrap/48431 * lto-plugin.c (claim_file_handler): Do not declare vars in code. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171983 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--lto-plugin/ChangeLog5
-rw-r--r--lto-plugin/lto-plugin.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 761e8cdace3..c3baa761429 100644
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -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-03-25 Release Manager
* GCC 4.6.0 released.
diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c
index 64a0164da3c..661f10cdf98 100644
--- a/lto-plugin/lto-plugin.c
+++ b/lto-plugin/lto-plugin.c
@@ -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.
Can't use PRIx64, because that's C99, so we have to print the
64-bit hex int as two 32-bit ones. */
- int lo, hi;
+ int lo, hi, t;
lo = file->offset & 0xffffffff;
hi = ((int64_t)file->offset >> 32) & 0xffffffff;
- int t = hi ? asprintf (&objname, "%s@0x%x%08x", file->name, lo, hi)
- : asprintf (&objname, "%s@0x%x", file->name, lo);
+ t = hi ? asprintf (&objname, "%s@0x%x%08x", file->name, lo, hi)
+ : asprintf (&objname, "%s@0x%x", file->name, lo);
check (t >= 0, LDPL_FATAL, "asprintf failed");
lto_file.name = objname;
}