Merge pull request #4119 from pshipton/omrcpu

__xlC__ is not defined by xlclang
eclipse-openj9 · Jul 11, 2019 · fe63843 · fe63843
2 parents d8493a0 + c37fffd
commit fe63843
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/port/unix/omrcpu.c b/port/unix/omrcpu.c
@@ -94,7 +94,7 @@ omrcpu_startup(struct OMRPortLibrary *portLibrary)
 
 #if ((__IBMC__ || __IBMCPP__) && (!defined(RS6000) || (__xlC__ < 0x1000)))
 	dcbz((void *) &buf[512]);
-#elif defined(LINUX) || defined(OSX) || (defined(RS6000) && (__xlC__ >= 0x1000))
+#elif defined(LINUX) || defined(OSX) || defined(RS6000)
 	__asm__(
 		"dcbz 0, %0"
 		: /* no outputs */
@@ -155,7 +155,7 @@ omrcpu_flush_icache(struct OMRPortLibrary *portLibrary, void *memoryPointer, uin
 
 #if ((__IBMC__ || __IBMCPP__) && (!defined(RS6000) || (__xlC__ < 0x1000)))
 		dcbst(addr);
-#elif defined(LINUX) || defined(OSX) || (defined(RS6000) && (__xlC__ >= 0x1000))
+#elif defined(LINUX) || defined(OSX) || defined(RS6000)
 		__asm__(
 			"dcbst 0,%0"
 			: /* no outputs */
@@ -165,7 +165,7 @@ omrcpu_flush_icache(struct OMRPortLibrary *portLibrary, void *memoryPointer, uin
 
 #if ((__IBMC__ || __IBMCPP__) && (!defined(RS6000) || (__xlC__ < 0x1000)))
 	sync();
-#elif defined(LINUX) || defined(OSX) || (defined(RS6000) && (__xlC__ >= 0x1000))
+#elif defined(LINUX) || defined(OSX) || defined(RS6000)
 	__asm__("sync");
 #endif
 
@@ -174,7 +174,7 @@ omrcpu_flush_icache(struct OMRPortLibrary *portLibrary, void *memoryPointer, uin
 
 #if ((__IBMC__ || __IBMCPP__) && (!defined(RS6000) || (__xlC__ < 0x1000)))
 		icbi(addr);
-#elif defined(LINUX) || defined(OSX) || (defined(RS6000) && (__xlC__ >= 0x1000))
+#elif defined(LINUX) || defined(OSX) || defined(RS6000)
 		__asm__(
 			"icbi 0,%0"
 			: /* no outputs */
@@ -185,7 +185,7 @@ omrcpu_flush_icache(struct OMRPortLibrary *portLibrary, void *memoryPointer, uin
 #if ((__IBMC__ || __IBMCPP__) && (!defined(RS6000) || (__xlC__ < 0x1000)))
 	sync();
 	isync();
-#elif defined(LINUX) || defined(OSX) || (defined(RS6000) && (__xlC__ >= 0x1000))
+#elif defined(LINUX) || defined(OSX) || defined(RS6000)
 	__asm__("sync");
 	__asm__("isync");
 #endif