From f5545ebef2aa4dbb2ea17c29f4ceb36c12f2ace1 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 13 May 2019 15:57:33 +0000 Subject: [PATCH] [PATCH] A couple of driver cleanups https://gcc.gnu.org/ml/gcc-patches/2019-05/msg00624.html * gcc.c (execute): Simplify cond-expr into if. Reformat comment. (run_attempt): Reformat line break From-SVN: r271131 --- gcc/ChangeLog | 5 +++++ gcc/gcc.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f53d5b3c405..0baa99366a5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-05-13 Nathan Sidwell + + * gcc.c (execute): Simplify cond-expr into if. Reformat comment. + (run_attempt): Reformat line break. + 2019-05-13 David Edelsohn PR target/90418 diff --git a/gcc/gcc.c b/gcc/gcc.c index a1003a5cdf9..cee9d68cbee 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -3068,7 +3068,8 @@ execute (void) if (!wrapper_string) { string = find_a_file (&exec_prefixes, commands[0].prog, X_OK, false); - commands[0].argv[0] = (string) ? string : commands[0].argv[0]; + if (string) + commands[0].argv[0] = string; } for (n_commands = 1, i = 0; argbuf.iterate (i, &arg); i++) @@ -3077,8 +3078,7 @@ execute (void) #if defined (__MSDOS__) || defined (OS2) || defined (VMS) fatal_error (input_location, "%<-pipe%> not supported"); #endif - argbuf[i] = 0; /* Termination of - command args. */ + argbuf[i] = 0; /* Termination of command args. */ commands[n_commands].prog = argbuf[i + 1]; commands[n_commands].argv = &(argbuf.address ())[i + 1]; @@ -6926,8 +6926,8 @@ run_attempt (const char **new_argv, const char *out_temp, fatal_error (input_location, "pex_init failed: %m"); errmsg = pex_run (pex, pex_flags, new_argv[0], - CONST_CAST2 (char *const *, const char **, &new_argv[1]), out_temp, - err_temp, &err); + CONST_CAST2 (char *const *, const char **, &new_argv[1]), + out_temp, err_temp, &err); if (errmsg != NULL) { errno = err; -- 2.30.2