Upstream patch "Do not fail testsuite on new gcc behaviour"