From 8ead22235d2315c4bd8d1fc7ebc561a6a6b14f1c Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 10 Feb 2011 08:57:24 +0000 Subject: re PR lto/47241 (lto not work on mingw32, reporting 'ld.exe: could not unlink output file') 2011-02-10 Kai Tietz PR lto/47241 * lto.c (lto_read_section_data): Free fd_name in failure case. For mingw targets don't hash file-descriptor. (read_cgraph_and_symbols): Close current_lto_file in failure case. From-SVN: r169999 --- gcc/lto/ChangeLog | 9 +++++++++ gcc/lto/lto.c | 20 ++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) (limited to 'gcc') diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 4cb66fe..3872a35 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,12 @@ +2011-02-10 Kai Tietz + + PR lto/47241 + * lto.c (lto_read_section_data): Free + fd_name in failure case. + For mingw targets don't hash file-descriptor. + (read_cgraph_and_symbols): Close current_lto_file + in failure case. + 2011-01-11 Jan Hubicka PR lto/45721 diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index cbc192a..71c8cdb 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -590,10 +590,10 @@ lto_read_section_data (struct lto_file_decl_data *file_data, } if (fd == -1) { - fd_name = xstrdup (file_data->file_name); fd = open (file_data->file_name, O_RDONLY|O_BINARY); if (fd == -1) return NULL; + fd_name = xstrdup (file_data->file_name); } #if LTO_MMAP_IO @@ -619,9 +619,17 @@ lto_read_section_data (struct lto_file_decl_data *file_data, || read (fd, result, len) != (ssize_t) len) { free (result); - return NULL; + result = NULL; } - +#ifdef __MINGW32__ + /* Native windows doesn't supports delayed unlink on opened file. So + we close file here again. This produces higher I/O load, but at least + it prevents to have dangling file handles preventing unlink. */ + free (fd_name); + fd_name = NULL; + close (fd); + fd = -1; +#endif return result; #endif } @@ -2147,7 +2155,11 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames) file_data = lto_file_read (current_lto_file, resolution, &count); if (!file_data) - break; + { + lto_obj_file_close (current_lto_file); + current_lto_file = NULL; + break; + } decl_data[last_file_ix++] = file_data; -- cgit v1.1