diff options
| author | Fanbo Meng <fanbo.meng@ibm.com> | 2024-04-03 09:44:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 09:44:59 -0400 |
| commit | 4d34b3295f005f739e431f379ef02da7eac75688 (patch) | |
| tree | 0db7153d0367a3f706131f4af94ad86f1ef84e4c | |
| parent | e329b68413cd63e03780e1e170ffe53c5edaeea3 (diff) | |
| download | llvm-4d34b3295f005f739e431f379ef02da7eac75688.zip llvm-4d34b3295f005f739e431f379ef02da7eac75688.tar.gz llvm-4d34b3295f005f739e431f379ef02da7eac75688.tar.bz2 | |
[SystemZ][z/OS] Remove COMPILER_IBMXL macro for z/OS (#87493)
This copies the change made in google benchmark
(https://github.com/google/benchmark/commit/70916cbf71f50b9e1e6f13559e10d6dbb92beb32)
to remove COMPILER_IBMXL for z/OS.
| -rw-r--r-- | third-party/benchmark/src/cycleclock.h | 5 | ||||
| -rw-r--r-- | third-party/benchmark/src/internal_macros.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/third-party/benchmark/src/cycleclock.h b/third-party/benchmark/src/cycleclock.h index eff563e..d4f1330 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 8dd7d0c..f4894ba 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) |