>> Attached is a follow-up patch, which fixes the remaining issues (see >> comment #8 in the PR). >> >> Regression-tested on x86_64-unknown-linux-gnu. Ok for trunk? >> > > OK. Thanks for the patch. Thanks. Committed as r149586. Janus