From 691738652b7c0ecdf82d215f7e746c0b53cc6b09 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 19 Apr 2000 02:40:21 +0000
Subject: [PATCH] Update.

	* gmon/gmon.c: Add weak alias moncontrol for __moncontrol.
	* gmon/Versions: Move moncontrol to GLIBC_2.2.
---
 ChangeLog     | 3 +++
 NEWS          | 4 ++++
 gmon/Versions | 6 +++++-
 gmon/gmon.c   | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b0398f3e93..10ac64ccd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-18  Ulrich Drepper  <drepper@redhat.com>
 
+	* gmon/gmon.c: Add weak alias moncontrol for __moncontrol.
+	* gmon/Versions: Move moncontrol to GLIBC_2.2.
+
 	* po/cs.po: Update from translation team.
 
 	* sysdeps/generic/updwtmp.c: Remove daemon support.
diff --git a/NEWS b/NEWS
index 90dc236734..68f896e6a5 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,10 @@ Version 2.2
 
 * Plural handling in gettext implemented by Ulrich Drepper.
 
+* The utmp daemon has been removed.
+
+* The port to MIPS-Linux has been finished by Andreas Jaeger.
+
 
 Version 2.1.3
 
diff --git a/gmon/Versions b/gmon/Versions
index d546690b8e..c39f1d1f74 100644
--- a/gmon/Versions
+++ b/gmon/Versions
@@ -7,9 +7,13 @@ libc {
     __monstartup; _mcleanup; __profile_frequency;
 
     # m*
-    moncontrol; monstartup;
+    monstartup;
 
     # p*
     profil; profil_counter;
   }
+  GLIBC_2.2 {
+    # m*
+    moncontrol;
+  }
 }
diff --git a/gmon/gmon.c b/gmon/gmon.c
index 51142cfb32..45fe6e8ac4 100644
--- a/gmon/gmon.c
+++ b/gmon/gmon.c
@@ -90,6 +90,7 @@ __moncontrol (mode)
       p->state = GMON_PROF_OFF;
     }
 }
+weak_alias (__moncontrol, moncontrol)
 
 
 void