From: Tristan Gingold <gingold@adacore.com>
Date: Mon, 23 May 2011 10:20:01 +0000 (+0000)
Subject: gcov.c (create_file_names): If no object directory is specified, keep the directory... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15882fe97cb65d99dd117330ccc05c5c86404a85;p=gcc.git

gcov.c (create_file_names): If no object directory is specified, keep the directory of the file.

	* gcov.c (create_file_names): If no object directory is specified,
	keep the directory of the file.

Co-Authored-By: Eric Botcazou <ebotcazou@adacore.com>

From-SVN: r174062
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7398cbd1c9..70c97e03f8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-23  Tristan Gingold  <gingold@adacore.com>
+	    Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcov.c (create_file_names): If no object directory is specified,
+	keep the directory of the file.
+
 2011-05-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* configure.ac (enable_threads): Remove irix; add lynx, tpf; sort list.
diff --git a/gcc/gcov.c b/gcc/gcov.c
index dcbadce4b14..94a1c350c80 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -652,13 +652,12 @@ release_structures (void)
     }
 }
 
-/* Generate the names of the graph and data files. If OBJECT_DIRECTORY
-   is not specified, these are looked for in the current directory,
-   and named from the basename of the FILE_NAME sans extension. If
-   OBJECT_DIRECTORY is specified and is a directory, the files are in
-   that directory, but named from the basename of the FILE_NAME, sans
-   extension. Otherwise OBJECT_DIRECTORY is taken to be the name of
-   the object *file*, and the data files are named from that.  */
+/* Generate the names of the graph and data files.  If OBJECT_DIRECTORY
+   is not specified, these are named from FILE_NAME sans extension.  If
+   OBJECT_DIRECTORY is specified and is a directory, the files are in that
+   directory, but named from the basename of the FILE_NAME, sans extension.
+   Otherwise OBJECT_DIRECTORY is taken to be the name of the object *file*
+   and the data files are named from that.  */
 
 static void
 create_file_names (const char *file_name)
@@ -691,8 +690,8 @@ create_file_names (const char *file_name)
   else
     {
       name = XNEWVEC (char, length + 1);
-      name[0] = 0;
-      base = 1;
+      strcpy (name, file_name);
+      base = 0;
     }
 
   if (base)