From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 14 Mar 2014 17:58:52 +0000 (+0100)
Subject: re PR middle-end/60484 (-fdump-rtl-expand and attribute optimize gives incorrect... 
X-Git-Tag: releases/gcc-4.9.0~450
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91035653db2e23fa0f3b941537b8787731e67e29;p=thirdparty%2Fgcc.git

re PR middle-end/60484 (-fdump-rtl-expand and attribute optimize gives incorrect dump file path)

	PR middle-end/60484
	* common.opt (dump_base_name_prefixed): New Variable.
	* opts.c (finish_options): Don't prepend directory to x_dump_base_name
	if x_dump_base_name_prefixed is already set, set it at the end.


Co-Authored-By: Marek Polacek <polacek@redhat.com>

From-SVN: r208571
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09b6e1f73656..5e61b25db5f9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-14  Jakub Jelinek  <jakub@redhat.com>
+	    Marek Polacek  <polacek@redhat.com>
+
+	PR middle-end/60484
+	* common.opt (dump_base_name_prefixed): New Variable.
+	* opts.c (finish_options): Don't prepend directory to x_dump_base_name
+	if x_dump_base_name_prefixed is already set, set it at the end.
+
 2014-03-14  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/60508
diff --git a/gcc/common.opt b/gcc/common.opt
index de3fafffa965..62c72f0d2fbf 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -211,6 +211,10 @@ bool flag_opts_finished
 Variable
 unsigned int flag_sanitize
 
+; Flag whether a prefix has been added to dump_base_name
+Variable
+bool dump_base_name_prefixed = false
+
 ###
 Driver
 
diff --git a/gcc/opts.c b/gcc/opts.c
index a83740802782..fdc903f9271a 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -644,7 +644,9 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
 {
   enum unwind_info_type ui_except;
 
-  if (opts->x_dump_base_name && ! IS_ABSOLUTE_PATH (opts->x_dump_base_name))
+  if (opts->x_dump_base_name
+      && ! IS_ABSOLUTE_PATH (opts->x_dump_base_name)
+      && ! opts->x_dump_base_name_prefixed)
     {
       /* First try to make OPTS->X_DUMP_BASE_NAME relative to the
 	 OPTS->X_DUMP_DIR_NAME directory.  Then try to make
@@ -674,6 +676,7 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
 	      opts->x_dump_base_name = new_dump_base_name;
 	    }
 	}
+	opts->x_dump_base_name_prefixed = true;
     }
 
   /* Handle related options for unit-at-a-time, toplevel-reorder, and