Merge pull request #472 from Sonicadvance1/ARM-is-not-generic

Make it so ARMv7 isn't a generic target.

CMakeLists.txt

@@ -151,8 +151,6 @@ if(NOT ENABLE_GENERIC)
 		set(_M_ARM 1)
 		set(_M_ARM_32 1)
 		add_definitions(-D_M_ARM=1 -D_M_ARM_32=1)
-		# ARMv7 isn't a generic build anymore, this shouldn't need to be defined
-		set(ENABLE_GENERIC 1)
 		if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a")
 			add_definitions(-marm -march=armv7-a)
 		endif()

Source/Core/Common/CMakeLists.txt

@@ -31,17 +31,16 @@ set(SRCS	BreakPoints.cpp
 if(_M_ARM_32) #ARMv7
 	set(SRCS ${SRCS}
 	         ArmCPUDetect.cpp
-	         ArmEmitter.cpp)
-else()
-	if(_M_X86) #X86
-		set(SRCS ${SRCS}
-		         x64FPURoundMode.cpp)
-	endif()
-	set(SRCS ${SRCS} x64CPUDetect.cpp)
-endif()
-if(_M_GENERIC) #Generic
-	set(SRCS	${SRCS}
-				GenericFPURoundMode.cpp)
+	         ArmEmitter.cpp
+	         GenericFPURoundMode.cpp)
+elseif(_M_X86) #X86
+	set(SRCS ${SRCS}
+		   x64CPUDetect.cpp
+		   x64FPURoundMode.cpp)
+else() #Generic
+	set(SRCS ${SRCS}
+	         GenericFPURoundMode.cpp
+	         x64CPUDetect.cpp)
 endif()
 if(WIN32)
 	set(SRCS ${SRCS} ExtendedTrace.cpp)

Source/Core/Common/CommonFuncs.h

@@ -36,7 +36,7 @@ struct ArraySizeImpl : public std::extent<T>
 #endif
 
 #if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \
-    !defined __SSSE3__ && !defined _M_GENERIC
+    !defined __SSSE3__ && defined _M_X86
 #include <emmintrin.h>
 static __inline __m128i __attribute__((__always_inline__))
 _mm_shuffle_epi8(__m128i a, __m128i mask)
@@ -61,10 +61,10 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
 // go to debugger mode
 	#ifdef GEKKO
 		#define Crash()
-	#elif defined _M_GENERIC
-		#define Crash() { exit(1); }
-	#else
+	#elif defined _M_X86
 		#define Crash() {asm ("int $3");}
+	#else
+		#define Crash() { exit(1); }
 	#endif
 
 // GCC 4.8 defines all the rotate functions now

Source/Core/VideoCommon/CMakeLists.txt

@@ -38,7 +38,7 @@ set(SRCS	BPFunctions.cpp
 			XFStructs.cpp)
 set(LIBS core png)
 
-if(NOT _M_GENERIC)
+if(_M_X86)
 	set(SRCS ${SRCS}	TextureDecoder_x64.cpp)
 else()
 	set(SRCS ${SRCS}	TextureDecoder_Generic.cpp)