Replacing the preprocessor conditions with if-elseif, as the

preprocessor code will never be compiled.

Author: BODAPATIMAHESH

src/powerpc/linux/ppc64-hw.c

@@ -1,35 +1,17 @@
 #include <string.h>
-
 #include <dlfcn.h>
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#if CPUINFO_MOCK
-#include <cpuinfo-mock.h>
-#endif
-
 #include <cpuinfo.h>
 #include <cpuinfo/log.h>
 #include <powerpc/linux/api.h>
-
 #include <sys/auxv.h>
 
-#if CPUINFO_MOCK
-static uint32_t mock_hwcap = 0;
-void cpuinfo_set_hwcap(uint32_t hwcap) {
-	mock_hwcap = hwcap;
-}
-#endif
-
 void cpuinfo_powerpc_linux_hwcap_from_getauxval(uint32_t isa_feature[]) {
-#if CPUINFO_MOCK
-	isa_feature[0] = mock_hwcap;
-#else
 	isa_feature[0] = (uint32_t)getauxval(AT_HWCAP);
 	isa_feature[1] = (uint32_t)getauxval(AT_HWCAP2);
-#endif
 }

test/name/power-features.cc

@@ -16,26 +16,23 @@ TEST(PowerFeatures, Power) {
 		fprintf(stderr, "failed to initialize CPU information\n");
 		exit(1);
 	}
-#if CPUINFO_MOCK
-	int a = mock_hwcap;
-#else
-	int a = (uint32_t)getauxval(AT_HWCAP);
-	int b = (uint32_t)getauxval(AT_HWCAP2);
-#endif // CPUINFO_MOCK //
+	uint32_t a = (uint32_t)getauxval(AT_HWCAP);
+	volatile uint32_t b = (uint32_t)getauxval(AT_HWCAP2);
 
-#if (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_3_1)
+	if (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_3_1) {
 	EXPECT_EQ(0, cpuinfo_has_powerpc_htm());
 	EXPECT_EQ(1, cpuinfo_has_powerpc_mma());
 	EXPECT_EQ(1, cpuinfo_has_powerpc_vsx());
-#elif (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_3_00)
+	}
+	else if (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_3_00) {
 	EXPECT_EQ(0, cpuinfo_has_powerpc_htm());
 	EXPECT_EQ(0, cpuinfo_has_powerpc_mma());
 	EXPECT_EQ(1, cpuinfo_has_powerpc_vsx());
-#elif (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_2_07)
+	}
+	else if (b & CPUINFO_POWERPC_LINUX_FEATURE_ARCH_2_07) {
 	EXPECT_EQ(1, cpuinfo_has_powerpc_htm());
 	EXPECT_EQ(0, cpuinfo_has_powerpc_mma());
 	EXPECT_EQ(1, cpuinfo_has_powerpc_vsx());
-#endif
-
+	}
 	cpuinfo_deinitialize();
 }