Remove -march
Revert "Remove -march"

This reverts commit 90e9988ceccc786e3b279306bef717b8441e2e95.
Restructure options
Move analysis stuff into separate unit