about summary refs log tree commit diff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/i386-mcount.S20
-rw-r--r--sysdeps/i386/machine-gmon.h6
2 files changed, 8 insertions, 18 deletions
diff --git a/sysdeps/i386/i386-mcount.S b/sysdeps/i386/i386-mcount.S
index 3d71198003..727d7a0ab8 100644
--- a/sysdeps/i386/i386-mcount.S
+++ b/sysdeps/i386/i386-mcount.S
@@ -1,5 +1,5 @@
 /* i386-specific implemetation of profiling support.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -36,22 +36,12 @@ C_LABEL(_mcount)
 	pushl %ecx
 	pushl %edx
 
-	movl 12(%esp), %eax
-	movl 4(%ebp), %ecx
-	pushl %eax
-	pushl %ecx
+	movl 12(%esp), %edx
+	movl 4(%ebp), %eax
 
-#ifdef PIC
-	call 1f
-1:	popl %ecx
-	addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx
-	movl C_SYMBOL_NAME(__mcount_internal@GOT)(%ecx), %eax
-	call *%eax
-#else
+	/* No need to access the PLT or GOT, __mcount_internal is an
+	   internal function and we can make a relative call.  */
 	call C_SYMBOL_NAME(__mcount_internal)
-#endif
-	popl %ecx
-	popl %eax	/* Pop the parameters.  */
 
 	/* Pop the saved registers.  Please note that `mcount' has no
 	   return value.  */
diff --git a/sysdeps/i386/machine-gmon.h b/sysdeps/i386/machine-gmon.h
index 33ec76388c..21aba79f36 100644
--- a/sysdeps/i386/machine-gmon.h
+++ b/sysdeps/i386/machine-gmon.h
@@ -1,5 +1,5 @@
 /* i386-specific implementation of profiling support.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -30,10 +30,10 @@
 /* We must not pollute the global namespace.  */
 #define mcount_internal __mcount_internal
 
-void mcount_internal (u_long frompc, u_long selfpc);
+extern void mcount_internal (u_long frompc, u_long selfpc) internal_function;
 
 #define _MCOUNT_DECL(frompc, selfpc) \
-void mcount_internal (u_long frompc, u_long selfpc)
+void internal_function mcount_internal (u_long frompc, u_long selfpc)
 
 
 /* Define MCOUNT as empty since we have the implementation in another