RH 7.1 gcc fixes compiler bug