I think we now require sufficiently new kernel headers for building NPTL that we can just expect __NR_futex to be defined and not conditionalize it. That change is unrelated to your assembly changes, so please send it separately. Thanks, Roland