From 270d9d472952a8923fa8a6d9d830fea77f4b838f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 28 Dec 2002 10:24:40 +0000 Subject: Update. * inet/herrno.c (__h_errno_location): Remove. * inet/Makefile (routines): Add herrno-loc. * resolv/res_libc.c (__res_state): Remove. * resolv/Makefile (routines): Add res-state. * sysdeps/generic/herrno-loc.c: New file. * sysdeps/generic/res-state.c: New file. 2002-12-27 Jakub Jelinek --- nptl/ChangeLog | 6 ++++++ nptl/pt-system.c | 8 +------- nptl/tst-cancel-wrappers.sh | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 3288bcc..24c2fb6 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2002-12-27 Jakub Jelinek + + * pt-system.c (system): Remove cancellation handling. + * tst-cancel-wrappers.sh: Allow pt-system.o* to not use the + cancellation routines. + 2002-12-28 Ulrich Drepper * descr.h: Include . diff --git a/nptl/pt-system.c b/nptl/pt-system.c index e98f04c..f638a6a 100644 --- a/nptl/pt-system.c +++ b/nptl/pt-system.c @@ -26,11 +26,5 @@ int system (const char *line) { - int oldtype = CANCEL_ASYNC (); - - int result = __libc_system (line); - - CANCEL_RESET (oldtype); - - return result; + return __libc_system (line); } diff --git a/nptl/tst-cancel-wrappers.sh b/nptl/tst-cancel-wrappers.sh index 39ded2e..54c5e0f 100644 --- a/nptl/tst-cancel-wrappers.sh +++ b/nptl/tst-cancel-wrappers.sh @@ -67,7 +67,8 @@ C["__xpg_sigpause"]=1 /:$/ { if (seen) { - if (!seen_enable || !seen_disable) + # pt-system.o* in NPTL calls __libc_system directly. + if ((!seen_enable || !seen_disable) && !(object ~ /^pt-system.o/)) { printf "in '$1'(%s) %s'\''s cancellation missing\n", object, seen ret = 1 -- cgit v1.1