From c00c9d03658915b0763d5f86503035d848e062de Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 26 Jul 2018 14:13:14 +0200 Subject: [PATCH] Add linker_output as prefix for LTO temps (PR lto/86548). 2018-07-26 Martin Liska PR lto/86548 * lto-wrapper.c: Add linker_output as prefix for ltrans_output_file. 2018-07-26 Martin Liska PR lto/86548 * libiberty.h (make_temp_file_with_prefix): New function. 2018-07-26 Martin Liska 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 --- gcc/ChangeLog | 6 ++++++ gcc/lto-wrapper.c | 14 +++++++++++++- include/ChangeLog | 5 +++++ include/libiberty.h | 5 +++++ libiberty/ChangeLog | 8 ++++++++ libiberty/make-temp-file.c | 24 ++++++++++++++++++------ 6 files changed, 55 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3518ecfc376..d9e8e108331 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-07-26 Martin Liska + + PR lto/86548 + * lto-wrapper.c: Add linker_output as prefix + for ltrans_output_file. + 2018-07-26 Segher Boessenkool PR rtl-optimization/85805 diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index c3eb00dc0c2..cf4a8c659e0 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -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; diff --git a/include/ChangeLog b/include/ChangeLog index 7a8022b67c0..6d04fa14a67 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2018-07-26 Martin Liska + + PR lto/86548 + * libiberty.h (make_temp_file_with_prefix): New function. + 2018-05-30 Jan Hubicka * simple-object.h (simple_object_copy_lto_debug_sections): Add rename diff --git a/include/libiberty.h b/include/libiberty.h index dc09e791e41..0823614c00e 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -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 *); diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 398d0306d8c..dc5d9971f68 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2018-07-26 Martin Liska + + 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 * simple-object-elf.c (ENOTSUP): If not defined by errno.h, redirect diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index 89faed7f09e..21b05457542 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -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); +} -- 2.30.2