Remove __bb_init_func and __bb_exit_func [BZ #21974]

__bb_init_func and __bb_exit_func have been removed from GCC 3.3 in
2002 by

https://gcc.gnu.org/ml/gcc-patches/2002-09/msg00499.html

which also recommended that they should also be removed from glibc. These
functions exist only in libc.a and are used for gcov from versions of GCC
older than GCC 3.3.

	[BZ #21974]
	* gmon/Makefile (routines): Remove bb_init_func and
	bb_exit_func.
	(elide-routines.os): Removed.
	* include/sys/gmon.h (__bb): Likewise.
	(__bb_init_func): Likewise.
	(__bb_exit_func): Likewise.
This commit is contained in:
H.J. Lu 2017-08-20 06:39:10 -07:00
parent 94e6ba153b
commit 7ed87317c7
5 changed files with 11 additions and 134 deletions

View File

@ -1,3 +1,13 @@
2017-08-20 H.J. Lu <hongjiu.lu@intel.com>
[BZ #21974]
* gmon/Makefile (routines): Remove bb_init_func and
bb_exit_func.
(elide-routines.os): Removed.
* include/sys/gmon.h (__bb): Likewise.
(__bb_init_func): Likewise.
(__bb_exit_func): Likewise.
2017-08-20 H.J. Lu <hongjiu.lu@intel.com> 2017-08-20 H.J. Lu <hongjiu.lu@intel.com>
* debug/longjmp_chk.c (____longjmp_chk): Moved to ... * debug/longjmp_chk.c (____longjmp_chk): Moved to ...

View File

@ -23,9 +23,7 @@ subdir := gmon
include ../Makeconfig include ../Makeconfig
headers := sys/gmon.h sys/gmon_out.h sys/profil.h headers := sys/gmon.h sys/gmon_out.h sys/profil.h
routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq routines := gmon mcount profil sprofil prof-freq
elide-routines.os = bb_init_func bb_exit_func
tests = tst-sprofil tst-gmon tests = tst-sprofil tst-gmon
ifeq ($(build-profile),yes) ifeq ($(build-profile),yes)

View File

@ -1,74 +0,0 @@
/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger (davidm@cs.arizona.edu).
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
/* __bb_exit_func() dumps all the basic-block statistics linked into
the __bb_head chain to .d files. */
#include <sys/gmon.h>
#include <sys/gmon_out.h>
#include <sys/types.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <string.h>
#define OUT_NAME "gmon.out"
extern struct __bb *__bb_head attribute_hidden;
void
__bb_exit_func (void)
{
const int version = GMON_VERSION;
struct gmon_hdr ghdr;
struct __bb *ptr;
FILE *fp;
fp = fopen (OUT_NAME, "wb");
if (!fp)
{
perror (OUT_NAME);
return;
}
/* No threads use this stream. */
__fsetlocking (fp, FSETLOCKING_BYCALLER);
memcpy (&ghdr.cookie[0], GMON_MAGIC, 4);
memcpy (&ghdr.version, &version, sizeof (version));
fwrite_unlocked (&ghdr, sizeof (ghdr), 1, fp);
for (ptr = __bb_head; ptr != 0; ptr = ptr->next)
{
u_int ncounts = ptr->ncounts;
u_char tag;
u_int i;
tag = GMON_TAG_BB_COUNT;
fwrite_unlocked (&tag, sizeof (tag), 1, fp);
fwrite_unlocked (&ncounts, sizeof (ncounts), 1, fp);
for (i = 0; i < ncounts; ++i)
{
fwrite_unlocked (&ptr->addresses[i], sizeof (ptr->addresses[0]), 1,
fp);
fwrite_unlocked (&ptr->counts[i], sizeof (ptr->counts[0]), 1, fp);
}
}
fclose (fp);
}

View File

@ -1,53 +0,0 @@
/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger (davidm@cs.arizona.edu).
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
/* __bb_init_func is invoked at the beginning of each function, before
any registers have been saved. This generic routine should work
provided that calling this function doesn't mangle the arguments
passed to the function being called. If that's not the case, a
system specific routine must be provided. */
#include <sys/types.h>
#include <sys/gmon.h>
#include <stdlib.h>
void
__bb_init_func (struct __bb *bb)
{
struct gmonparam *p = &_gmonparam;
if (bb->zero_word != 0)
{
return; /* handle common case quickly */
}
/* insert this basic-block into basic-block list: */
bb->zero_word = 1;
bb->next = __bb_head;
__bb_head = bb;
if (bb->next == 0 && p->state != GMON_PROF_ON)
{
/* we didn't register _mcleanup yet and pc profiling doesn't seem
to be active, so let's register it now: */
extern void *__dso_handle __attribute__ ((__weak__));
__cxa_atexit ((void (*) (void *)) _mcleanup, NULL,
&__dso_handle ? __dso_handle : NULL);
}
}

View File

@ -9,10 +9,6 @@
extern void __write_profiling (void); extern void __write_profiling (void);
extern void write_profiling (void); extern void write_profiling (void);
struct __bb;
extern void __bb_init_func (struct __bb *bb);
extern void __bb_exit_func (void);
extern struct gmonparam _gmonparam attribute_hidden; extern struct gmonparam _gmonparam attribute_hidden;
# endif /* !_ISOMAC */ # endif /* !_ISOMAC */