Have these changes been sent upstream? Although at the present development stage applying selected changes might be better than a bulk merge from upstream libsanitizer, they should still go upstream so they aren't a local patch at the time of the next merge.
-- Joseph S. Myers jos...@codesourcery.com