Update to the 20171003 snapshot of GCC 5.4.1.
Sort two conditions with serveral references to ${ARCH} alphabetically.