Update.

2002-08-21  Andreas Jaeger  <aj@suse.de>

	* sysdeps/x86_64/sysdep.h (CALL_MCOUNT): Fix it.

	* sysdeps/x86_64/Makefile (sysdep_routines): Add _mcount.

	* sysdeps/x86_64/machine-gmon.h: New.
	* sysdeps/x86_64/_mcount.S: New.

diff --git a/ChangeLog b/ChangeLog
index 49769e4b7bd069f6c365e6f40787ae9d16303c3d..98837c9554ab8a5c602a76ddc6d8d675e9193696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-21  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/x86_64/sysdep.h (CALL_MCOUNT): Fix it.
+
+       * sysdeps/x86_64/Makefile (sysdep_routines): Add _mcount.
+
+       * sysdeps/x86_64/machine-gmon.h: New.
+       * sysdeps/x86_64/_mcount.S: New.
+
 2002-08-20  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/rtld.c (_dl_start): Pass zero to TLS_INIT_TP.  Set

diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index ad2a0cac06d44e1233c3dc4802c6999cb6750039..3b8328ad2ac16fae53333a2d90005b6f6a02c698 100644 (file)
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -5,3 +5,7 @@ ifeq ($(subdir),csu)
 sysdep_routines += hp-timing
 static-only-routines += hp-timing
 endif
+
+ifeq ($(subdir),gmon)
+sysdep_routines += _mcount
+endif

diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index 2a2ad41e520ef633bdae84dfd18fd73ebd95877f..a9c0d25f11f8110fee9a656ffbea478b4f3fcf1a 100644 (file)
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for x86-64.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -58,11 +58,10 @@
 
 /* If compiled for profiling, call `mcount' at the start of each function.  */
 #ifdef PROF
-/* XXX this does not work yet!  */
 /* The mcount code relies on a normal frame pointer being on the stack
    to locate our caller, so push one just for its benefit.  */
 #define CALL_MCOUNT \
-  pushl %ebp; movl %esp, %ebp; call JUMPTARGET(mcount); popl %ebp;
+  pushq %rbp; movq %rsp, %rbp; call JUMPTARGET(mcount); popq %rbp;
 #else
 #define CALL_MCOUNT            /* Do nothing.  */
 #endif