Andrew Benton wrote: > On Sun, 23 Jan 2011 15:02:42 -0800 > Bryan Kadzban <br...@kadzban.is-a-geek.net> wrote: >> I've verified that this patch fixes the problem. This might be possible >> with sed, but I'm not sure how. > > (Doh! Try again. Resending 'cos the the last one only changed one file) > This sed seems to do the same as your patch: > > sed -i 's/\(#if[^ ]* __ASSUME_\)PRIVATE_FUTEX/\1FUTEX_CLOCK_REALTIME/' \ > nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S
That will change line 144 of pthread_rwlock_timedwrlock.S, which needs to stay as it is. ...Oh, wait, no it won't: there's a space between the # and the ifdef on that line, so it won't match the regex. Ooooh, sneaky. :-) I'm not sure if that's the best setup; we'll have to make sure at each glibc release (until the bug is fixed) that no new private-futex tests are added. (That the sed is still equivalent to the patch.) It'd be nice if the sed could take into account the context of each line, but I believe that's rather difficult with sed. Anyone else have a preference?
signature.asc
Description: OpenPGP digital signature
-- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page