aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--csu/abi-note.S2
-rw-r--r--csu/gmon-start.c4
-rw-r--r--manual/signal.texi2
-rw-r--r--sysdeps/generic/bsd-_setjmp.c2
5 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5420cd377d..0ed71cdf7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-18 Martin Buchholz <martin@xemacs.org>
+
+ * csu/gmon-start.c (__gmon_start__): Avoid over-clever trick `if
+ (called++) return;'
+
+2000-11-21 Alan Modra <alan@linuxcare.com.au>
+
+ * sysdeps/generic/bsd-_setjmp.c (setjmp): Rename to _setjmp.
+
+ * csu/abi-note.S: Correct comment for operating system number.
+
2000-11-22 Ulrich Drepper <drepper@redhat.com>
* Versions.def: Add GLIBC_2.2.1 for glibc.
@@ -22,8 +33,7 @@
2000-11-22 Andreas Jaeger <aj@suse.de>
- * sysdeps/s390/bits/string.h (strncat): Add missing quotation
- marks.
+ * sysdeps/s390/bits/string.h (strncat): Add missing quotation marks.
2000-11-21 Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/csu/abi-note.S b/csu/abi-note.S
index a5014ab5cc..6050883d34 100644
--- a/csu/abi-note.S
+++ b/csu/abi-note.S
@@ -50,7 +50,7 @@ offset length contents
Linux community) use note type 1 and a vendor name string of "GNU"
for a note descriptor that indicates ABI requirements. The note data
is four 32-bit words. The first of these is an operating system
- number (0=Hurd, 1=Linux, 2=Solaris, ...) and the remaining three
+ number (0=Linux, 1=Hurd, 2=Solaris, ...) and the remaining three
identify the earliest release of that OS that supports this ABI.
See abi-tags (top level) for details. */
diff --git a/csu/gmon-start.c b/csu/gmon-start.c
index b5ad6f6ae8..e5b45333cd 100644
--- a/csu/gmon-start.c
+++ b/csu/gmon-start.c
@@ -49,8 +49,10 @@ __gmon_start__ (void)
into every shared library, each of their init functions will call us. */
static int called;
- if (called++)
+ if (called)
return;
+
+ called = 1;
#endif
/* Start keeping profiling records. */
diff --git a/manual/signal.texi b/manual/signal.texi
index 94972fa43d..90839375e2 100644
--- a/manual/signal.texi
+++ b/manual/signal.texi
@@ -596,7 +596,7 @@ time used by the current process. The name is an abbreviation for
@comment signal.h
@comment BSD
@deftypevr Macro int SIGPROF
-This signal is typically indicates expiration of a timer that measures
+This signal typically indicates expiration of a timer that measures
both CPU time used by the current process, and CPU time expended on
behalf of the process by the system. Such a timer is used to implement
code profiling facilities, hence the name of this signal.
diff --git a/sysdeps/generic/bsd-_setjmp.c b/sysdeps/generic/bsd-_setjmp.c
index 11cfdc0d7f..eba899003a 100644
--- a/sysdeps/generic/bsd-_setjmp.c
+++ b/sysdeps/generic/bsd-_setjmp.c
@@ -28,7 +28,7 @@
immediate unwinds. */
int
-setjmp (jmp_buf env)
+_setjmp (jmp_buf env)
{
return __sigsetjmp (env, 0);
}