3 files changed, 31 insertions, 1 deletions
diff --git a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile
index d2f690eb42..d8b465718b 100644
--- a/sysdeps/ia64/Makefile
+++ b/sysdeps/ia64/Makefile
@@ -1,6 +1,10 @@
 # The ia64 `long double' is a distinct type we support.
 long-double-fcts = yes
 
+ifeq ($(subdir),gmon)
+sysdep_routines += _mcount
+endif
+
 ifeq ($(subdir), csu)
 CPPFLAGS-start.S = -D__ASSEMBLY__
 endif
diff --git a/sysdeps/ia64/_mcount.S b/sysdeps/ia64/_mcount.S
index 5d0a26ad87..9f27561311 100644
--- a/sysdeps/ia64/_mcount.S
+++ b/sysdeps/ia64/_mcount.S
@@ -60,7 +60,7 @@ LEAF(_mcount)
 	mov loc3 = r15	// gcc uses r15 to pass the static link to nested functions
 	mov out0 = in2
 	mov out1 = rp
-	br.call.sptk.few rp = __mcount_internal
+	br.call.sptk.few rp = __mcount
 	;;
 .here:
 {
diff --git a/sysdeps/ia64/machine-gmon.h b/sysdeps/ia64/machine-gmon.h
new file mode 100644
index 0000000000..96a1623951
--- /dev/null
+++ b/sysdeps/ia64/machine-gmon.h
@@ -0,0 +1,26 @@
+/* Machine-specific calling sequence for `mcount' profiling function.  IA-64.
+   Copyright (C) 1995, 1996, 1997, 2000 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#define _MCOUNT_DECL(from, self) \
+ void __mcount (u_long from, u_long self)
+
+/* Call __mcount with our the return PC for our caller, and the return
+   PC our caller will return to.  Empty since we use an assembly stub
+   instead. */
+#define MCOUNT