about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/ia64/Makefile4
-rw-r--r--sysdeps/ia64/_mcount.S2
-rw-r--r--sysdeps/ia64/machine-gmon.h (renamed from sysdeps/unix/sysv/linux/ia64/machine-gmon.h)0
4 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bd81237cc..80db7cd409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-11-14  Jes Sorensen  <jes@linuxcare.com>
+
+	* sysdeps/ia64/_mcount.S: Call __mcount instead of __mcount_internal.
+
+	* sysdeps/ia64/Makefile: Compile _mcount.S in subdir gmon as
+	_mcount is required by profiled binaries.
+
+	* sysdeps/unix/sysv/linux/ia64/machine-gmon.h: Moved to...
+	* sysdeps/ia64/machine-gmon.h: ...here.
+
 2000-11-28  Masahide Washizawa  <washi@jp.ibm.com>
 
 	* iconvdata/Makefile (modules): Add IBM922, IBM1124, and IBM1129.
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/unix/sysv/linux/ia64/machine-gmon.h b/sysdeps/ia64/machine-gmon.h
index 96a1623951..96a1623951 100644
--- a/sysdeps/unix/sysv/linux/ia64/machine-gmon.h
+++ b/sysdeps/ia64/machine-gmon.h