MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add linker_output as prefix for LTO temps (PR lto/86548).

Browse Source 
2018-07-26  Martin Liska  <mliska@suse.cz>

        PR lto/86548
	* lto-wrapper.c: Add linker_output as prefix
        for ltrans_output_file.
2018-07-26  Martin Liska  <mliska@suse.cz>

        PR lto/86548
	* libiberty.h (make_temp_file_with_prefix): New function.
2018-07-26  Martin Liska  <mliska@suse.cz>

        PR lto/86548
	* make-temp-file.c (TEMP_FILE): Remove leading 'cc'.
	(make_temp_file): Call make_temp_file_with_prefix with
        first argument set to NULL.
	(make_temp_file_with_prefix): Support also prefix.

From-SVN: r262999
This commit is contained in:
Martin Liska 2018-07-26 14:13:14 +02:00 committed by Martin Liska
parent e98edc20cd
commit c00c9d0365
6 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2018-07-26 Martin Liska <mliska@suse.cz>
PR lto/86548
* lto-wrapper.c: Add linker_output as prefix
for ltrans_output_file.
2018-07-26 Segher Boessenkool <segher@kernel.crashing.org>
PR rtl-optimization/85805

14
gcc/lto-wrapper.c
View File

@ -1373,7 +1373,19 @@ cont1:
strcat (ltrans_output_file, ".ltrans.out");
}
else
ltrans_output_file = make_temp_file (".ltrans.out");
{
char *prefix = NULL;
if (linker_output)
{
prefix = (char *) xmalloc (strlen (linker_output) + 2);
strcpy (prefix, linker_output);
strcat (prefix, ".");
}
ltrans_output_file = make_temp_file_with_prefix (prefix,
".ltrans.out");
free (prefix);
}
list_option_full = (char *) xmalloc (sizeof (char) *
(strlen (ltrans_output_file) + list_option_len + 1));
tmp = list_option_full;

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2018-07-26 Martin Liska <mliska@suse.cz>
PR lto/86548
* libiberty.h (make_temp_file_with_prefix): New function.
2018-05-30 Jan Hubicka <hubicka@ucw.cz>
* simple-object.h (simple_object_copy_lto_debug_sections): Add rename

5
include/libiberty.h
View File

@ -239,6 +239,11 @@ extern char *choose_temp_base (void) ATTRIBUTE_MALLOC ATTRIBUTE_RETURNS_NONNULL;
extern char *make_temp_file (const char *) ATTRIBUTE_MALLOC;
/* Return a temporary file name with given PREFIX and SUFFIX
or NULL if unable to create one. */
extern char *make_temp_file_with_prefix (const char *, const char *) ATTRIBUTE_MALLOC;
/* Remove a link to a file unless it is special. */
extern int unlink_if_ordinary (const char *);

8
libiberty/ChangeLog
View File

@ -1,3 +1,11 @@
2018-07-26 Martin Liska <mliska@suse.cz>
PR lto/86548
* make-temp-file.c (TEMP_FILE): Remove leading 'cc'.
(make_temp_file): Call make_temp_file_with_prefix with
first argument set to NULL.
(make_temp_file_with_prefix): Support also prefix.
2018-07-19 Eli Zaretskii <eliz@gnu.org>
* simple-object-elf.c (ENOTSUP): If not defined by errno.h, redirect

24
libiberty/make-temp-file.c
View File

@ -56,7 +56,7 @@ extern int mkstemps (char *, int);
/* Name of temporary file.
mktemp requires 6 trailing X's. */
#define TEMP_FILE "ccXXXXXX"
#define TEMP_FILE "XXXXXX"
#define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
#if !defined(_WIN32) || defined(__CYGWIN__)
@ -181,25 +181,31 @@ string is @code{malloc}ed, and the temporary file has been created.
*/
char *
make_temp_file (const char *suffix)
make_temp_file_with_prefix (const char *prefix, const char *suffix)
{
const char *base = choose_tmpdir ();
char *temp_filename;
int base_len, suffix_len;
int base_len, suffix_len, prefix_len;
int fd;
if (prefix == 0)
prefix = "cc";
if (suffix == 0)
suffix = "";
base_len = strlen (base);
prefix_len = strlen (prefix);
suffix_len = strlen (suffix);
temp_filename = XNEWVEC (char, base_len
+ TEMP_FILE_LEN
+ suffix_len + 1);
+ suffix_len
+ prefix_len + 1);
strcpy (temp_filename, base);
strcpy (temp_filename + base_len, TEMP_FILE);
strcpy (temp_filename + base_len + TEMP_FILE_LEN, suffix);
strcpy (temp_filename + base_len, prefix);
strcpy (temp_filename + base_len + prefix_len, TEMP_FILE);
strcpy (temp_filename + base_len + prefix_len + TEMP_FILE_LEN, suffix);
fd = mkstemps (temp_filename, suffix_len);
/* Mkstemps failed. It may be EPERM, ENOSPC etc. */
@ -214,3 +220,9 @@ make_temp_file (const char *suffix)
abort ();
return temp_filename;
}
char *
make_temp_file (const char *suffix)
{
return make_temp_file_with_prefix (NULL, suffix);
}