about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-minimal.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f141b7b6bc..d1359f3808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/dl-minimal.c (__assert_fail): Change error string.  It's
+	most of the time no bug in ld.so.
+	(__assert_perror_fail): Likewise.
+
 2001-04-11  Hans-Peter Nilsson  <hp@axis.com>
 
 	* sysdeps/generic/bits/fenv.h (fexcept_t): Change default type
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index 8922edcd71..bb0932074f 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -188,7 +188,7 @@ __assert_fail (const char *assertion,
 	       const char *file, unsigned int line, const char *function)
 {
   _dl_fatal_printf ("\
-BUG IN DYNAMIC LINKER ld.so: %s: %u: %s%sAssertion `%s' failed!\n",
+Inconsistency detected by ld.so: %s: %u: %s%sAssertion `%s' failed!\n",
 		    file, line, function ?: "", function ? ": " : "",
 		    assertion);
 
@@ -201,7 +201,7 @@ __assert_perror_fail (int errnum,
 {
   char errbuf[64];
   _dl_fatal_printf ("\
-BUG IN DYNAMIC LINKER ld.so: %s: %u: %s%sUnexpected error: %s\n",
+Inconsistency detected by ld.so: %s: %u: %s%sUnexpected error: %s\n",
 		    file, line, function ?: "", function ? ": " : "",
 		    __strerror_r (errnum, errbuf, sizeof (errbuf)));
 }