Revert "Trig: make XOP, FMA4, FAM, BMI2 part of the type"

This reverts commit de9bcee.

1. This was only a partial fix, creating actual code breakage
2. This changes the ABI and thus should not happen in a patch release

common/trigonometric.h

@@ -39,17 +39,9 @@ template<> struct MapImpl<Vc::SSE42Impl> { enum Dummy { Value = MapImpl<Vc::SSE4
 
 template<Vc::Implementation Impl> using TrigonometricImplementation =
     ImplementationT<MapImpl<Impl>::Value
-#if defined(Vc_IMPL_XOP)
+#if defined(Vc_IMPL_XOP) && defined(Vc_IMPL_FMA4)
     + Vc::XopInstructions
-#endif
-#if defined(Vc_IMPL_FMA4)
     + Vc::Fma4Instructions
-#endif
-#if defined(Vc_IMPL_FMA)
-    + Vc::FmaInstructions
-#endif
-#if defined(Vc_IMPL_BMI2)
-    + Vc::Bmi2Instructions
 #endif
     >;
 }  // namespace Detail