Remove redundant macros for openxl

Remove __cplusplus macros that are used along with __open_xl__
macros.

Signed-off-by: Ishita Ray <ishita.ray@ibm.com>

Author: ishitaR88

compiler/compile/OSRData.cpp

@@ -1515,7 +1515,7 @@ bool TR_OSRCompilationData::TR_ScratchBufferInfo::operator==(const TR_ScratchBuf
 
 #if (defined(TR_HOST_POWER) && defined(TR_TARGET_POWER)                       \
            || defined(TR_HOST_S390) && defined(TR_TARGET_S390))               \
-        && (defined(__IBMCPP__) || defined(__open_xl__) && defined(__cplusplus))
+        && (defined(__IBMCPP__) || defined(__open_xl__))
 __attribute__((__noinline__))
 //This tiny function when inlined by xlC 12 or later at -O3 breaks java -version
 //on Power and causes intermittent crashes on z/OS with xlC 2.1.1

compiler/infra/Annotations.hpp

@@ -64,7 +64,7 @@
 #define OMR_NORETURN _declspec(noreturn)
 #elif defined(__GNUC__)
 #define OMR_NORETURN __attribute__ ((noreturn))
-#elif defined(__IBMCPP__) || defined(__open_xl__) && defined(__cplusplus)
+#elif defined(__IBMCPP__) || defined(__open_xl__)
 #define OMR_NORETURN __attribute__ ((noreturn))
 #else
 #warning "Noreturn attribute undefined for this platform."

compiler/runtime/OMRRuntimeAssumptions.cpp

@@ -22,7 +22,7 @@
 #include "runtime/OMRRuntimeAssumptions.hpp"
 #include "env/jittypes.h"
 
-#if (defined(__IBMCPP__) || defined(__open_xl__) && defined(__cplusplus)) && !defined(AIXPPC) && !defined(LINUXPPC)
+#if (defined(__IBMCPP__) || defined(__open_xl__)) && !defined(AIXPPC) && !defined(LINUXPPC)
 #define ASM_CALL __cdecl
 #else
 #define ASM_CALL

compiler/runtime/Runtime.cpp

@@ -23,7 +23,7 @@
 
 TR_RuntimeHelperTable runtimeHelpers;
 
-#if (defined(__IBMCPP__) || defined(__IBMC__) && !defined(MVS)) && !defined(LINUXPPC64) || defined(__open_xl__)
+#if (defined(__IBMCPP__) || defined(__IBMC__) || defined(__open_xl__) && !defined(MVS)) && !defined(LINUXPPC64)
  #if defined(AIXPPC)
   #define JIT_HELPER(x) extern "C" void *x
  #else

configure

@@ -3770,9 +3770,9 @@ if [ "$OMR_ENV_OPENXL" == "1" ]; then
   do
     CC="$ac_save_CC $ac_arg"
     if ac_fn_c_try_compile "$LINENO"; then :
-    ac_cv_prog_cc_c89=$ac_arg
-  fi
-  rm -f core conftest.err conftest.$ac_objext
+      ac_cv_prog_cc_c89=$ac_arg
+    fi
+    rm -f core conftest.err conftest.$ac_objext
     test "x$ac_cv_prog_cc_c89" != "xno" && break
   done
 else
@@ -3782,8 +3782,8 @@ else
     CC="$ac_save_CC $ac_arg"
     if ac_fn_c_try_compile "$LINENO"; then :
     ac_cv_prog_cc_c89=$ac_arg
-  fi
-  rm -f core conftest.err conftest.$ac_objext
+    fi
+    rm -f core conftest.err conftest.$ac_objext
     test "x$ac_cv_prog_cc_c89" != "xno" && break
   done
 fi

include_core/AtomicSupport.hpp

@@ -509,7 +509,7 @@ class VM_AtomicSupport
 #if defined(__GNUC__)
 		return (uint64_t)__sync_lock_test_and_set(address, newValue);
 #elif (defined(__xlC__)) /* defined(__GNUC__) */
-#if ((__xlC__ > 0x0d01) || ((__xlC__ == 0x0d01) && (__xlC_ver__ >= 0x00000300))) /* XLC >= 13.1.3 OR OpenXL */
+#if ((__xlC__ > 0x0d01) || ((__xlC__ == 0x0d01) && (__xlC_ver__ >= 0x00000300))) /* XLC >= 13.1.3 */
 		return (uint64_t)__fetch_and_swaplp((volatile unsigned long *)address, (unsigned long)newValue);
 #else /* ((__xlC__ > 0x0d01) || ((__xlC__ == 0x0d01) && (__xlC_ver__ >= 0x00000300))) */
 		return (uint64_t)__fetch_and_swaplp((volatile long *)address, (long)newValue);

include_core/omrcomp.h

@@ -237,7 +237,7 @@ typedef double SYS_FLOAT;
  * xlC11 C++ compiler reportedly supports attributes before function names, but we've only tested xlC12.
  * The C compiler doesn't support it.
  */
-#if defined(__cplusplus) && (__xlC__ >= 0xc00)  
+#if defined(__cplusplus) && (__xlC__ >= 0xc00)
 #define VMINLINE_ALWAYS inline __attribute__((always_inline))
 #endif
 #endif /* __xlC__ */