profile.c (da_file_name): New static var.

* 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.

From-SVN: r56164
This commit is contained in:
Nathan Sidwell 2002-08-09 08:51:27 +00:00 committed by Nathan Sidwell
parent 42127f5178
commit 2043c38e8d
5 changed files with 22 additions and 12 deletions

View File

@ -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

View File

@ -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

2
gcc/configure vendored
View File

@ -890,7 +890,7 @@ opt)
;;
esac
else
coverage_flags="-O2"
coverage_flags=""
fi

View File

@ -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,

View File

@ -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)