From 3b8c1a3f49fbb96b55d872397234210d0cca6763 Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Tue, 5 Apr 2011 12:11:08 +0000
Subject: [PATCH] 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
---
lto-plugin/ChangeLog | 5 +++++
lto-plugin/lto-plugin.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index e4a19cd81243..2e63db35451d 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-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate.
diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c
index 64a0164da3cf..661f10cdf989 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;
}
--
GitLab