From 149c3aa60a8796a137ede03bc8aa342eaa3bcdc4 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 10 May 1999 10:51:25 +0000
Subject: [PATCH] [Forgot to commit this in the batch a few days ago.]

Fixed profiling of elf kernels.  Made high resolution profiling compile
for elf kernels (it is broken for all kernels due to lack of egcs support).

Renaming of many assembler labels is avoided by declaring by declaring
the labels that need to be visible to gprof as having type "function"
and depending on the elf version of gprof being zealous about discarding
the others.  A few type declarations are still missing, mainly for SMP.

PR:		9413
Submitted by:	Assar Westerlund <assar@sics.se> (initial parts)
---
 sys/amd64/amd64/identcpu.c | 4 +++-
 sys/i386/i386/identcpu.c   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index e04ff52df4df..0ae73aa9360f 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.60 1999/03/10 20:42:00 roberto Exp $
+ *	$Id: identcpu.c,v 1.61 1999/05/03 23:57:13 billf Exp $
  */
 
 #include "opt_cpu.h"
@@ -633,6 +633,7 @@ __asm
 ("
 	.text
 	.p2align 2,0x90
+	.type	" __XSTRING(CNAME(bluetrap6)) ",@function
 " __XSTRING(CNAME(bluetrap6)) ":
 	ss
 	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
@@ -649,6 +650,7 @@ __asm
 ("
 	.text
 	.p2align 2,0x90
+	.type " __XSTRING(CNAME(bluetrap13)) ",@function
 " __XSTRING(CNAME(bluetrap13)) ":
 	ss
 	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index e04ff52df4df..0ae73aa9360f 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.60 1999/03/10 20:42:00 roberto Exp $
+ *	$Id: identcpu.c,v 1.61 1999/05/03 23:57:13 billf Exp $
  */
 
 #include "opt_cpu.h"
@@ -633,6 +633,7 @@ __asm
 ("
 	.text
 	.p2align 2,0x90
+	.type	" __XSTRING(CNAME(bluetrap6)) ",@function
 " __XSTRING(CNAME(bluetrap6)) ":
 	ss
 	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
@@ -649,6 +650,7 @@ __asm
 ("
 	.text
 	.p2align 2,0x90
+	.type " __XSTRING(CNAME(bluetrap13)) ",@function
 " __XSTRING(CNAME(bluetrap13)) ":
 	ss
 	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "