#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include <errno.h>
+#include <signal.h>
+#if ! defined( SIGCHLD ) && defined( SIGCLD )
+# define SIGCHLD SIGCLD
+#endif
#include "intl.h"
#include "libiberty.h"
#include "obstack.h"
+#ifndef HAVE_KILL
+#define kill(p,s) raise(s)
+#endif
+
int debug; /* true if -save-temps. */
int verbose; /* true if -v. */
static char *ltrans_output_file;
static char *flto_out;
static char *args_name;
+static unsigned int nr;
+static char **input_names;
+static char **output_names;
+static char *makefile;
static void maybe_unlink_file (const char *);
-/* Delete tempfiles and exit function. */
+ /* Delete tempfiles. */
static void
-lto_wrapper_exit (int status)
+lto_wrapper_cleanup (void)
{
static bool cleanup_done = false;
- if (!cleanup_done)
+ unsigned int i;
+
+ if (cleanup_done)
+ return;
+
+ /* Setting cleanup_done prevents an infinite loop if one of the
+ calls to maybe_unlink_file fails. */
+ cleanup_done = true;
+
+ if (ltrans_output_file)
+ maybe_unlink_file (ltrans_output_file);
+ if (flto_out)
+ maybe_unlink_file (flto_out);
+ if (args_name)
+ maybe_unlink_file (args_name);
+ if (makefile)
+ maybe_unlink_file (makefile);
+ for (i = 0; i < nr; ++i)
{
- /* Setting cleanup_done prevents an infinite loop if one of the
- calls to maybe_unlink_file fails. */
- cleanup_done = true;
-
- if (ltrans_output_file)
- maybe_unlink_file (ltrans_output_file);
- if (flto_out)
- maybe_unlink_file (flto_out);
- if (args_name)
- maybe_unlink_file (args_name);
+ maybe_unlink_file (input_names[i]);
+ if (output_names[i])
+ maybe_unlink_file (output_names[i]);
}
- exit (status);
+}
+
+static void
+fatal_signal (int signum)
+{
+ signal (signum, SIG_DFL);
+ lto_wrapper_cleanup ();
+ /* Get the same signal again, this time not handled,
+ so its normal effect occurs. */
+ kill (getpid (), signum);
}
/* Just die. CMSGID is the error message. */
fprintf (stderr, "\n");
va_end (ap);
- lto_wrapper_exit (FATAL_EXIT_CODE);
+ lto_wrapper_cleanup ();
+ exit (FATAL_EXIT_CODE);
}
fprintf (stderr, ": %s\n", xstrerror (e));
va_end (ap);
- lto_wrapper_exit (FATAL_EXIT_CODE);
+ lto_wrapper_cleanup ();
+ exit (FATAL_EXIT_CODE);
}
{
if (! debug)
{
- if (unlink_if_ordinary (file))
+ if (unlink_if_ordinary (file)
+ && errno != ENOENT)
fatal_perror ("deleting LTRANS file %s", file);
}
else
collect_wait (new_argv[0], pex);
maybe_unlink_file (args_name);
+ args_name = NULL;
free (at_args);
}
struct obstack env_obstack;
bool seen_o = false;
int parallel = 0;
+ int jobserver = 0;
/* Get the driver and options. */
collect_gcc = getenv ("COLLECT_GCC");
lto_mode = LTO_MODE_WHOPR;
if (option[7] == '=')
{
- parallel = atoi (option+8);
- if (parallel <= 1)
- parallel = 0;
+ if (!strcmp (option + 8, "jobserver"))
+ {
+ jobserver = 1;
+ parallel = 1;
+ }
+ else
+ {
+ parallel = atoi (option+8);
+ if (parallel <= 1)
+ parallel = 0;
+ }
}
}
else
if (linker_output)
{
char *dumpbase = (char *) xmalloc (strlen (linker_output)
- + sizeof(".wpa") + 1);
+ + sizeof (".wpa") + 1);
strcpy (dumpbase, linker_output);
strcat (dumpbase, ".wpa");
argv_ptr[0] = dumpbase;
}
- ltrans_output_file = make_temp_file (".ltrans.out");
+ if (linker_output && debug)
+ {
+ ltrans_output_file = (char *) xmalloc (strlen (linker_output)
+ + sizeof (".ltrans.out") + 1);
+ strcpy (ltrans_output_file, linker_output);
+ strcat (ltrans_output_file, ".ltrans.out");
+ }
+ else
+ ltrans_output_file = make_temp_file (".ltrans.out");
list_option_full = (char *) xmalloc (sizeof (char) *
(strlen (ltrans_output_file) + list_option_len + 1));
tmp = list_option_full;
else if (lto_mode == LTO_MODE_WHOPR)
{
FILE *stream = fopen (ltrans_output_file, "r");
- unsigned int nr = 0;
- char **input_names = NULL;
- char **output_names = NULL;
- char *makefile = NULL;
FILE *mstream = NULL;
if (!stream)
fatal_perror ("fopen: %s", ltrans_output_file);
- argv_ptr[1] = "-fltrans";
-
- if (parallel)
- {
- makefile = make_temp_file (".mk");
- mstream = fopen (makefile, "w");
- }
-
+ /* Parse the list of LTRANS inputs from the WPA stage. */
+ nr = 0;
for (;;)
{
const unsigned piece = 32;
- char *output_name;
+ char *output_name = NULL;
char *buf, *input_name = (char *)xmalloc (piece);
size_t len;
if (input_name[0] == '*')
output_name = &input_name[1];
- else
- {
- /* Otherwise, add FILES[I] to lto_execute_ltrans command line
- and add the resulting file to LTRANS output list. */
-
- /* Replace the .o suffix with a .ltrans.o suffix and write
- the resulting name to the LTRANS output list. */
- obstack_init (&env_obstack);
- obstack_grow (&env_obstack, input_name, strlen (input_name) - 2);
- obstack_grow (&env_obstack, ".ltrans.o", sizeof (".ltrans.o"));
- output_name = XOBFINISH (&env_obstack, char *);
-
- if (linker_output)
- {
- char *dumpbase
- = (char *) xmalloc (strlen (linker_output)
- + sizeof(DUMPBASE_SUFFIX) + 1);
- snprintf (dumpbase,
- strlen (linker_output) + sizeof(DUMPBASE_SUFFIX),
- "%s.ltrans%u", linker_output, nr);
- argv_ptr[0] = dumpbase;
- }
-
- argv_ptr[2] = "-o";
- argv_ptr[3] = output_name;
- argv_ptr[4] = input_name;
- argv_ptr[5] = NULL;
-
- if (parallel)
- {
- fprintf (mstream, "%s:\n\t@%s ", output_name, new_argv[0]);
- for (i = 1; new_argv[i] != NULL; ++i)
- fprintf (mstream, " '%s'", new_argv[i]);
- fprintf (mstream, "\n");
- }
- else
- fork_execute (CONST_CAST (char **, new_argv));
- }
nr++;
input_names = (char **)xrealloc (input_names, nr * sizeof (char *));
input_names[nr-1] = input_name;
output_names[nr-1] = output_name;
}
+ fclose (stream);
+ maybe_unlink_file (ltrans_output_file);
+ ltrans_output_file = NULL;
+
+ if (parallel)
+ {
+ makefile = make_temp_file (".mk");
+ mstream = fopen (makefile, "w");
+ }
+
+ /* Execute the LTRANS stage for each input file (or prepare a
+ makefile to invoke this in parallel). */
+ for (i = 0; i < nr; ++i)
+ {
+ char *output_name;
+ char *input_name = input_names[i];
+ /* If it's a pass-through file do nothing. */
+ if (output_names[i])
+ continue;
+
+ /* Replace the .o suffix with a .ltrans.o suffix and write
+ the resulting name to the LTRANS output list. */
+ obstack_init (&env_obstack);
+ obstack_grow (&env_obstack, input_name, strlen (input_name) - 2);
+ obstack_grow (&env_obstack, ".ltrans.o", sizeof (".ltrans.o"));
+ output_name = XOBFINISH (&env_obstack, char *);
+
+ /* Adjust the dumpbase if the linker output file was seen. */
+ if (linker_output)
+ {
+ char *dumpbase
+ = (char *) xmalloc (strlen (linker_output)
+ + sizeof(DUMPBASE_SUFFIX) + 1);
+ snprintf (dumpbase,
+ strlen (linker_output) + sizeof(DUMPBASE_SUFFIX),
+ "%s.ltrans%u", linker_output, i);
+ argv_ptr[0] = dumpbase;
+ }
+
+ argv_ptr[1] = "-fltrans";
+ argv_ptr[2] = "-o";
+ argv_ptr[3] = output_name;
+ argv_ptr[4] = input_name;
+ argv_ptr[5] = NULL;
+ if (parallel)
+ {
+ fprintf (mstream, "%s:\n\t@%s ", output_name, new_argv[0]);
+ for (j = 1; new_argv[j] != NULL; ++j)
+ fprintf (mstream, " '%s'", new_argv[j]);
+ fprintf (mstream, "\n");
+ }
+ else
+ fork_execute (CONST_CAST (char **, new_argv));
+
+ output_names[i] = output_name;
+ }
if (parallel)
{
struct pex_obj *pex;
char jobs[32];
+
fprintf (mstream, "all:");
for (i = 0; i < nr; ++i)
fprintf (mstream, " \\\n\t%s", output_names[i]);
fprintf (mstream, "\n");
fclose (mstream);
- /* Avoid passing --jobserver-fd= and similar flags. */
- putenv (xstrdup ("MAKEFLAGS="));
- putenv (xstrdup ("MFLAGS="));
+ if (!jobserver)
+ {
+ /* Avoid passing --jobserver-fd= and similar flags
+ unless jobserver mode is explicitly enabled. */
+ putenv (xstrdup ("MAKEFLAGS="));
+ putenv (xstrdup ("MFLAGS="));
+ }
new_argv[0] = getenv ("MAKE");
if (!new_argv[0])
new_argv[0] = "make";
new_argv[1] = "-f";
new_argv[2] = makefile;
- snprintf (jobs, 31, "-j%d", parallel);
- new_argv[3] = jobs;
- new_argv[4] = "all";
- new_argv[5] = NULL;
+ i = 3;
+ if (!jobserver)
+ {
+ snprintf (jobs, 31, "-j%d", parallel);
+ new_argv[i++] = jobs;
+ }
+ new_argv[i++] = "all";
+ new_argv[i++] = NULL;
pex = collect_execute (CONST_CAST (char **, new_argv));
collect_wait (new_argv[0], pex);
maybe_unlink_file (makefile);
+ makefile = NULL;
}
for (i = 0; i < nr; ++i)
{
maybe_unlink_file (input_names[i]);
free (input_names[i]);
}
+ nr = 0;
free (output_names);
free (input_names);
- fclose (stream);
- maybe_unlink_file (ltrans_output_file);
free (list_option_full);
}
else
{
gcc_init_libintl ();
+ if (signal (SIGINT, SIG_IGN) != SIG_IGN)
+ signal (SIGINT, fatal_signal);
+#ifdef SIGHUP
+ if (signal (SIGHUP, SIG_IGN) != SIG_IGN)
+ signal (SIGHUP, fatal_signal);
+#endif
+ if (signal (SIGTERM, SIG_IGN) != SIG_IGN)
+ signal (SIGTERM, fatal_signal);
+#ifdef SIGPIPE
+ if (signal (SIGPIPE, SIG_IGN) != SIG_IGN)
+ signal (SIGPIPE, fatal_signal);
+#endif
+#ifdef SIGCHLD
+ /* We *MUST* set SIGCHLD to SIG_DFL so that the wait4() call will
+ receive the signal. A different setting is inheritable */
+ signal (SIGCHLD, SIG_DFL);
+#endif
+
/* We may be called with all the arguments stored in some file and
passed with @file. Expand them into argv before processing. */
expandargv (&argc, &argv);
OSDN Git Service
