* profile.c (da_file_name): New static var.

	(init_branch_prob): Initialize it.
	(end_branch_prob): Remove da file.

	* Makefile.in (stage1_build): Pass empty COVERAGE_FLAGS.
	* configure.in (coverage_flags) default to nothing.
	* configure: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56164 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13f43d8..aa73454 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * profile.c (da_file_name): New static var.
+       (init_branch_prob): Initialize it.
+       (end_branch_prob): Remove da file.
+
+       * Makefile.in (stage1_build): Pass empty COVERAGE_FLAGS.
+       * configure.in (coverage_flags) default to nothing.
+       * configure: Rebuilt.
+
 2002-08-09  Neil Booth  <neil@daikokuya.co.uk>
 
        * Makefile.in (c-opts.o): Update

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c747007..d221b54 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3320,7 +3320,7 @@ STAGE2_FLAGS_TO_PASS = \
 stage1_build:
        $(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" \
                CFLAGS="$(STAGE1_CFLAGS)" MAKEINFO="$(MAKEINFO)" \
-               MAKEINFOFLAGS="$(MAKEINFOFLAGS)"
+               MAKEINFOFLAGS="$(MAKEINFOFLAGS)" COVERAGE_FLAGS=
        $(STAMP) stage1_build
        echo stage1_build > stage_last
 

diff --git a/gcc/configure b/gcc/configure
index d738be5..94fc4b8 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -890,7 +890,7 @@ opt)
        ;;
 esac
 else
-  coverage_flags="-O2"
+  coverage_flags=""
 fi
 
 

diff --git a/gcc/configure.in b/gcc/configure.in
index 6b7d2f2..e9977a6 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -273,7 +273,7 @@ opt)
        AC_MSG_ERROR(unknown coverage setting $enableval)
        ;;
 esac],
-[coverage_flags="-O2"])
+[coverage_flags=""])
 AC_SUBST(coverage_flags)
 
 AC_ARG_WITH(cpp_install_dir,

diff --git a/gcc/profile.c b/gcc/profile.c
index 36ce8a3..528fc6f 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -127,6 +127,7 @@ static FILE *bbg_file;
 /* Name and file pointer of the input file for the arc count data.  */
 
 static FILE *da_file;
+static char *da_file_name;
 
 /* Pointer of the output file for the basic block/line number map.  */
 static FILE *bb_file;
@@ -1185,12 +1186,11 @@ void
 init_branch_prob (filename)
   const char *filename;
 {
-  long len;
+  int len = strlen (filename);
   int i;
 
   if (flag_test_coverage)
     {
-      int len = strlen (filename);
       char *data_file, *bbg_file_name;
 
       /* Open an output file for the basic block/line number map.  */
@@ -1212,15 +1212,14 @@ init_branch_prob (filename)
       last_bb_file_name = 0;
     }
 
+  da_file_name = (char *) xmalloc (len + 4);
+  strcpy (da_file_name, filename);
+  strcat (da_file_name, ".da");
+  
   if (flag_branch_probabilities)
     {
-      char *da_file_name;
-
-      len = strlen (filename);
-      da_file_name = (char *) alloca (len + 4);
-      strcpy (da_file_name, filename);
-      strcat (da_file_name, ".da");
-      if ((da_file = fopen (da_file_name, "rb")) == 0)
+      da_file = fopen (da_file_name, "rb");
+      if (!da_file)
        warning ("file %s not found, execution counts assumed to be zero",
                 da_file_name);
     }
@@ -1251,6 +1250,7 @@ end_branch_prob ()
     {
       fclose (bb_file);
       fclose (bbg_file);
+      unlink (da_file_name);
     }
 
   if (flag_branch_probabilities && da_file)