Can you revert the formatting changes?  If we have to change the libraries it's best to have a minimal and clean change set so that we can easily see what changed when upgrading in the future and not accidentally thinking this was just changing the whitespace.

Also - I might be inclined to add this in the makefile instead

    CFLAGS += -DARM_MATH_CM4

that way it only applies to the targets we want (e.g. not the bootloader)