about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-02 22:41:11 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-02 22:41:11 +0000
commit134abcb5b9ba854fec25051cd3c9f88e760913c5 (patch)
tree3988d22ca828c20e2fa396d7b021915a5d6f47e6 /linuxthreads
parentb77ca0e82754c1b0615e5ca6acd343018ffcb287 (diff)
downloadglibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.tar.gz
glibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.tar.xz
glibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.zip
Update.
2003-09-26  Paolo Bonzini  <bonzini@gnu.org>

	* posix/regcomp.c (parse_sub_exp): Pass RE_CARET_ANCHORS_HERE
	for the first token in a subexpression as well.

2003-10-02  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (peek_token): Add 2003-09-20 changes for anchor
	handling again.
	(parse_reg_exp): Likewise.
	* posix/regex.h (RE_CARET_ANCHORS_HERE): Define.

	* posix/bug-regex11.c (tests): Add new tests.
	* posix/bug-regex12.c (tests): Add new test.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 0cef025bbe..2241a28eac 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (DOCARGS_1): Use
+	correct offset.
+
 2003-10-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile (tests): Add tst-cancel8.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index fae701aefe..5cf115c549 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -63,7 +63,7 @@
 # define _POPCARGS_0	/* No arguments to pop.  */
 
 # define PUSHCARGS_1	movl %ebx, %edx; PUSHCARGS_0
-# define DOCARGS_1	_DOARGS_1 (4)
+# define DOCARGS_1	_DOARGS_1 (8)
 # define POPCARGS_1	POPCARGS_0; movl %edx, %ebx
 # define _PUSHCARGS_1	pushl %ebx; L(PUSHBX2): _PUSHCARGS_0
 # define _POPCARGS_1	_POPCARGS_0; popl %ebx; L(POPBX2):