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.

diff --git a/ChangeLog b/ChangeLog
index 7badd6bb8da89922d3b8b541a26b12228b3c0d1c..6eefebe7c4bd238341c31ba9da30518ba02b1d3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * debug/longjmp_chk.c (____longjmp_chk): Moved to ...

diff --git a/gmon/Makefile b/gmon/Makefile
index 39f11acec242616bd423a42af45866df0fa12bee..ea5d88412adde02107f764aacc06698b1c84391f 100644 (file)
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -23,9 +23,7 @@ subdir        := gmon
 include ../Makeconfig
 
 headers        := sys/gmon.h sys/gmon_out.h sys/profil.h
-routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq
-
-elide-routines.os = bb_init_func bb_exit_func
+routines := gmon mcount profil sprofil prof-freq
 
 tests  = tst-sprofil tst-gmon
 ifeq ($(build-profile),yes)

diff --git a/gmon/bb_exit_func.c b/gmon/bb_exit_func.c
deleted file mode 100644 (file)
index 3ad344a..0000000
--- a/gmon/bb_exit_func.c
+++ /dev/null
@@ -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);
-}

diff --git a/gmon/bb_init_func.c b/gmon/bb_init_func.c
deleted file mode 100644 (file)
index e0fe756..0000000
--- a/gmon/bb_init_func.c
+++ /dev/null
@@ -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);
-    }
-}

diff --git a/include/sys/gmon.h b/include/sys/gmon.h
index 30889d8bc38847e90973192c7da9e1989d399b65..06b07fb2a5ae79f633f7237e544cfc341b5eb87e 100644 (file)
--- a/include/sys/gmon.h
+++ b/include/sys/gmon.h
@@ -9,10 +9,6 @@
 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;
 
 # endif /* !_ISOMAC */