From 52fd37831a15c845d0d0f693e54ff471fc836ca1 Mon Sep 17 00:00:00 2001
From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Apr 2011 12:11:08 +0000
Subject: [PATCH] 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/trunk@171982 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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