[PATCH] Remove __bb_init_func and __bb_exit_func [BZ #21974]

[PATCH] Remove __bb_init_func and __bb_exit_func [BZ #21974]

[H.J. Lu]

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

OK for master?

H.J.
---
	[BZ #21974]
	* gmon/Makefile (routines): Remove bb_init_func and
	bb_exit_func.
	(elide-routines.os): Removed.
---
 gmon/Makefile       |  4 +--
 gmon/bb_exit_func.c | 74 -----------------------------------------------------
 gmon/bb_init_func.c | 53 --------------------------------------
 3 files changed, 1 insertion(+), 130 deletions(-)
 delete mode 100644 gmon/bb_exit_func.c
 delete mode 100644 gmon/bb_init_func.c

diff --git a/gmon/Makefile b/gmon/Makefile
index 39f11acec2..ea5d88412a 100644
--- 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
index 3ad344a216..0000000000
--- 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
index e0fe756da8..0000000000
--- 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);
-    }
-}
-- 
2.13.5

Re: [PATCH] Remove __bb_init_func and __bb_exit_func [BZ #21974]

[Florian Weimer]

* H. J. Lu:

> 	[BZ #21974]
> 	* gmon/Makefile (routines): Remove bb_init_func and
> 	bb_exit_func.
> 	(elide-routines.os): Removed.

Looks good.  Several current architectures did not even have GCC 3.3
support, and yet we still provide these functions.

Re: [PATCH] Remove __bb_init_func and __bb_exit_func [BZ #21974]

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

On Sun, Aug 20, 2017 at 12:50 AM, Florian Weimer <fw@deneb.enyo.de> wrote:
> * H. J. Lu:
>
>>       [BZ #21974]
>>       * gmon/Makefile (routines): Remove bb_init_func and
>>       bb_exit_func.
>>       (elide-routines.os): Removed.
>
> Looks good.  Several current architectures did not even have GCC 3.3
> support, and yet we still provide these functions.

This is what I checked in.

-- 
H.J.

[-- Attachment #2: 0001-Remove-__bb_init_func-and-__bb_exit_func-BZ-21974.patch --]
[-- Type: text/x-patch, Size: 6983 bytes --]

From 7ed87317c7fb08990e943698ed06c75377320ab0 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 20 Aug 2017 06:39:10 -0700
Subject: [PATCH] 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.
---
 ChangeLog           | 10 ++++++++
 gmon/Makefile       |  4 +--
 gmon/bb_exit_func.c | 74 -----------------------------------------------------
 gmon/bb_init_func.c | 53 --------------------------------------
 include/sys/gmon.h  |  4 ---
 5 files changed, 11 insertions(+), 134 deletions(-)
 delete mode 100644 gmon/bb_exit_func.c
 delete mode 100644 gmon/bb_init_func.c

diff --git a/ChangeLog b/ChangeLog
index 7badd6bb8d..6eefebe7c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 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 ...
 	* include/setjmp.h (____longjmp_chk): Here.  Add
 	attribute_hidden.
diff --git a/gmon/Makefile b/gmon/Makefile
index 39f11acec2..ea5d88412a 100644
--- 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
index 3ad344a216..0000000000
--- 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
index e0fe756da8..0000000000
--- 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 30889d8bc3..06b07fb2a5 100644
--- 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 */
-- 
2.13.5

Re: [PATCH] Remove __bb_init_func and __bb_exit_func [BZ #21974]

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

On Sun, Aug 20, 2017 at 6:40 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sun, Aug 20, 2017 at 12:50 AM, Florian Weimer <fw@deneb.enyo.de> wrote:
>> * H. J. Lu:
>>
>>>       [BZ #21974]
>>>       * gmon/Makefile (routines): Remove bb_init_func and
>>>       bb_exit_func.
>>>       (elide-routines.os): Removed.
>>
>> Looks good.  Several current architectures did not even have GCC 3.3
>> support, and yet we still provide these functions.
>
> This is what I checked in.
>

I will check in this patch to also remove sysdeps/alpha/bb_init_func.S.

-- 
H.J.

[-- Attachment #2: 0001-Remove-sysdeps-alpha-bb_init_func.S.patch --]
[-- Type: text/x-patch, Size: 3042 bytes --]

From fc77e888dedc85d249d51410a8f5e1ade512f668 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 20 Aug 2017 06:44:15 -0700
Subject: [PATCH] Remove sysdeps/alpha/bb_init_func.S

Since the generic __bb_init_func has been removed by commit 7ed87317c7fb,
there is no need for sysdeps/alpha/bb_init_func.S.

	[BZ #21974]
	* sysdeps/alpha/bb_init_func.S: Removed.
---
 sysdeps/alpha/bb_init_func.S | 86 --------------------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 sysdeps/alpha/bb_init_func.S

diff --git a/sysdeps/alpha/bb_init_func.S b/sysdeps/alpha/bb_init_func.S
deleted file mode 100644
index a3064d8abc..0000000000
--- a/sysdeps/alpha/bb_init_func.S
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
-   Contributed by David Mosberger (davidm@cs.arizona.edu).
-   This file is part of the GNU C Library.
-
-   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.  It is therefore safe to use any
-   caller-saved (call-used) registers (except for argument registers
-   a1-a5). */
-
-#include <sysdep.h>
-
-/*
- * These offsets should match with "struct bb" declared in gcc/libgcc2.c.
- */
-#define	ZERO_WORD	0x00
-#define NEXT		0x20
-
-	.set	noat
-	.set	noreorder
-
-ENTRY(__bb_init_func)
-	.prologue 0
-
-	ldq	t0, ZERO_WORD(a0)	/* t0 <- blocks->zero_word */
-	beq	t0, init		/* not initialized yet -> */
-	ret
-
-END(__bb_init_func)
-
-	.ent init
-init:
-	.frame	sp, 0x38, ra, 0
-	subq	sp, 0x38, sp
-	.prologue 0
-
-	stq	pv, 0x30(sp)
-	br	pv, 1f
-1:	ldgp	gp, 0(pv)
-
-	ldiq	t1, __bb_head
-	lda	t3, _gmonparam
-	ldq	t2, 0(t1)
-	ldl	t3, 0(t3)		/* t3 = _gmonparam.state */
-	lda	t0, 1
-	stq	t0, ZERO_WORD(a0)	/* blocks->zero_word = 1 */
-	stq	t2, NEXT(a0)		/* blocks->next = __bb_head */
-	stq	a0, 0(t1)
-	bne	t2, $leave
-	beq	t3, $leave		/* t3 == GMON_PROF_ON? yes -> */
-
-	/* also need to initialize destructor: */
-	stq	ra, 0x00(sp)
-	lda	a0, __bb_exit_func
-	stq	a1, 0x08(sp)
-	lda	pv, atexit
-	stq	a2, 0x10(sp)
-	stq	a3, 0x18(sp)
-	stq	a4, 0x20(sp)
-	stq	a5, 0x28(sp)
-	jsr	ra, (pv), atexit
-	ldq	ra, 0x00(sp)
-	ldq	a1, 0x08(sp)
-	ldq	a2, 0x10(sp)
-	ldq	a3, 0x18(sp)
-	ldq	a4, 0x20(sp)
-	ldq	a5, 0x28(sp)
-
-$leave:	ldq	pv, 0x30(sp)
-	addq	sp, 0x38, sp
-	ret
-
-	.end init
-- 
2.13.5