[SystemZ][z/OS] Remove COMPILER_IBMXL macro for z/OS

[fanbo-meng]

This copies the change made in google benchmark (google/benchmark@70916cb) to remove COMPILER_IBMXL for z/OS.

[abhina-sree]

LGTM

[llvmbot]

@llvm/pr-subscribers-third-party-benchmark

Author: Fanbo Meng (fanbo-meng)

Changes

This copies the change made in google benchmark (google/benchmark@70916cb) to remove COMPILER_IBMXL for z/OS.

---

Full diff: https://github.com/llvm/llvm-project/pull/87493.diff

2 Files Affected:

• (modified) third-party/benchmark/src/cycleclock.h (+3-2)
• (modified) third-party/benchmark/src/internal_macros.h (+1-5)

diff --git a/third-party/benchmark/src/cycleclock.h b/third-party/benchmark/src/cycleclock.h
index eff563e7fac223..d4f1330b671db9 100644
--- a/third-party/benchmark/src/cycleclock.h
+++ b/third-party/benchmark/src/cycleclock.h
@@ -181,10 +181,11 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
 #elif defined(__s390__)  // Covers both s390 and s390x.
   // Return the CPU clock.
   uint64_t tsc;
-#if defined(BENCHMARK_OS_ZOS) && defined(COMPILER_IBMXL)
-  // z/OS XL compiler HLASM syntax.
+#if defined(BENCHMARK_OS_ZOS)
+  // z/OS HLASM syntax.
   asm(" stck %0" : "=m"(tsc) : : "cc");
 #else
+  // Linux on Z syntax.
   asm("stck %0" : "=Q"(tsc) : : "cc");
 #endif
   return tsc;
diff --git a/third-party/benchmark/src/internal_macros.h b/third-party/benchmark/src/internal_macros.h
index 8dd7d0c6502e86..f4894ba8e65d62 100644
--- a/third-party/benchmark/src/internal_macros.h
+++ b/third-party/benchmark/src/internal_macros.h
@@ -11,11 +11,7 @@
 #endif
 
 #if defined(__clang__)
-  #if defined(__ibmxl__)
-    #if !defined(COMPILER_IBMXL)
-      #define COMPILER_IBMXL
-    #endif
-  #elif !defined(COMPILER_CLANG)
+  #if !defined(COMPILER_CLANG)
     #define COMPILER_CLANG
   #endif
 #elif defined(_MSC_VER)