PLT bypassing for __errno_location() and __h_errno_location()

[Julian Seward]

Regarding the following

   "* Sun Apr 06 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-4.80.5
   - make sure all calls to __errno_location() and __h_errno_location()
     jump through .plt to make older wine happy"

the same problem also breaks valgrind on 2.3.2.  So I would like to ask,
is this fix in the mainline glibc sources, and if not is it likely to get 
merged in?

Thanks,

J