This was worked around upstream by the fix for https://sourceware.org/bugzilla/show_bug.cgi?id=29517 . We could consider backporting the fix for gas.