From ad905e4346ef4cc0c8dc16b975f553afc9600979 Mon Sep 17 00:00:00 2001
From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 1 Feb 2011 14:42:08 +0000
Subject: [PATCH] Check HOST_BIT_BUCKET when settting dump base/dir.
2011-02-01 H.J. Lu <hongjiu.lu@intel.com>
PR driver/47547
* lto-wrapper.c (run_gcc): Don't add -dumpdir if linker_output
is HOST_BIT_BUCKET.
* opts.c (finish_options): Don't add x_aux_base_name if it is
HOST_BIT_BUCKET.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169479 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 9 +++++++++
gcc/lto-wrapper.c | 8 ++++++--
gcc/opts.c | 3 ++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f43325b6e7..302867cd5f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR driver/47547
+ * lto-wrapper.c (run_gcc): Don't add -dumpdir if linker_output
+ is HOST_BIT_BUCKET.
+
+ * opts.c (finish_options): Don't add x_aux_base_name if it is
+ HOST_BIT_BUCKET.
+
2011-02-01 Richard Guenther <rguenther@suse.de>
PR tree-optimization/47555
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index 6f106a31f45..613c7b054df 100644
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -392,6 +392,7 @@ run_gcc (unsigned argc, char *argv[])
if (linker_output)
{
char *output_dir, *base, *name;
+ bool bit_bucket = strcmp (linker_output, HOST_BIT_BUCKET) == 0;
output_dir = xstrdup (linker_output);
base = output_dir;
@@ -406,8 +407,11 @@ run_gcc (unsigned argc, char *argv[])
static char current_dir[] = { '.', DIR_SEPARATOR, '\0' };
output_dir = current_dir;
}
- *argv_ptr++ = "-dumpdir";
- *argv_ptr++ = output_dir;
+ if (!bit_bucket)
+ {
+ *argv_ptr++ = "-dumpdir";
+ *argv_ptr++ = output_dir;
+ }
*argv_ptr++ = "-dumpbase";
}
diff --git a/gcc/opts.c b/gcc/opts.c
index b958a091e85..9a3fb133a31 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -633,7 +633,8 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
if (opts->x_dump_dir_name)
opts->x_dump_base_name = concat (opts->x_dump_dir_name,
opts->x_dump_base_name, NULL);
- else if (opts->x_aux_base_name)
+ else if (opts->x_aux_base_name
+ && strcmp (opts->x_aux_base_name, HOST_BIT_BUCKET) != 0)
{
const char *aux_base;
--
GitLab