i've rolled these changes up into:
  https://sourceware.org/ml/libc-alpha/2016-04/msg00419.html
-mike