git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR lto/50616 (lto1.exe: internal compiler error: invalid resolution in the resolution file) 

PR lto/50616
        * lto-plugin.c (PRI_LL): New macro.
        (dump_symtab): Use PRI_LL instead of ll in print.
        (process_symtab): Use PRI_LL instead of ll in scan.

From-SVN: r184462
This commit is contained in:
Kai Tietz 2012-02-22 11:19:22 +01:00 committed by Kai Tietz
parent 0b262c28c6
commit 8cfa78994a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lto-plugin/ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-22 Kai Tietz <ktietz@redhat.com>
PR lto/50616
* lto-plugin.c (PRI_LL): New macro.
(dump_symtab): Use PRI_LL instead of ll in print.
(process_symtab): Use PRI_LL instead of ll in scan.
2011-12-20 Andreas Schwab <schwab@linux-m68k.org> 2011-12-20 Andreas Schwab <schwab@linux-m68k.org>
* configure: Regenerate. * configure: Regenerate.

12
lto-plugin/lto-plugin.c
View File

@ -62,6 +62,14 @@ along with this program; see the file COPYING3. If not see
#include "simple-object.h" #include "simple-object.h"
#include "plugin-api.h" #include "plugin-api.h"
/* We need to use I64 instead of ll width-specifier on native Windows.
The reason for this is that older MS-runtimes don't support the ll. */
#ifdef __MINGW32__
#define PRI_LL "I64"
#else
#define PRI_LL "ll"
#endif
/* Handle opening elf files on hosts, such as Windows, that may use /* Handle opening elf files on hosts, such as Windows, that may use
text file handling that will break binary access. */ text file handling that will break binary access. */
#ifndef O_BINARY #ifndef O_BINARY
@ -360,7 +368,7 @@ dump_symtab (FILE *f, struct plugin_symtab *symtab)
assert (resolution != LDPR_UNKNOWN); assert (resolution != LDPR_UNKNOWN);
fprintf (f, "%u %llx %s %s\n", fprintf (f, "%u %" PRI_LL "x %s %s\n",
(unsigned int) slot, symtab->aux[j].id, (unsigned int) slot, symtab->aux[j].id,
lto_resolution_str[resolution], lto_resolution_str[resolution],
symtab->syms[j].name); symtab->syms[j].name);
@ -816,7 +824,7 @@ process_symtab (void *data, const char *name, off_t offset, off_t length)
s = strrchr (name, '.'); s = strrchr (name, '.');
if (s) if (s)
sscanf (s, ".%llx", &obj->out->id); sscanf (s, ".%" PRI_LL "x", &obj->out->id);
secdata = xmalloc (length); secdata = xmalloc (length);
offset += obj->file->offset; offset += obj->file->offset;
if (offset != lseek (obj->file->fd, offset, SEEK_SET) if (offset != lseek (obj->file->fd, offset, SEEK_SET)