architecture/x86-64: fixed typo in optimisation identifier for Core i3/i5/i7 Ivybridge
architecture/x86-64: add optimisation choice for Core i3/i5/i7 Haswell