diff options
| author |  Copybara-Service <copybara-worker@google.com> | 2023-06-07 08:00:48 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-07 08:00:48 -0700 |
| commit | 181480b1d04e27d65c9615a14186d1f3f2cdcb17 (patch) | |
| tree | 3e47d2e2b14ab618bb23f1bf1006e3d85d76cbff | |
| parent | 86aaa72a33a9f6729d6cf3f7a8d551935cf5b5f8 (diff) | |
| parent | 339c79d40535d5e2ea8e56dfbff76c283315f2d3 (diff) | |
Merge pull request #1458 from juergbi:aix
PiperOrigin-RevId: 538488164
Change-Id: I680dcbc2f27dca3beba416b3cd0a55943751cf4c
| -rw-r--r-- | absl/base/internal/unscaledcycleclock.cc | 5 | ||||
| -rw-r--r-- | absl/status/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc index b1c396c6..05e0e7ba 100644 --- a/absl/base/internal/unscaledcycleclock.cc +++ b/absl/base/internal/unscaledcycleclock.cc @@ -71,13 +71,12 @@ int64_t UnscaledCycleClock::Now() { #else int32_t tbu, tbl, tmp; asm volatile( - "0:\n" "mftbu %[hi32]\n" "mftb %[lo32]\n" "mftbu %[tmp]\n" "cmpw %[tmp],%[hi32]\n" - "bne 0b\n" - : [ hi32 ] "=r"(tbu), [ lo32 ] "=r"(tbl), [ tmp ] "=r"(tmp)); + "bne $-16\n" // Retry on failure. + : [hi32] "=r"(tbu), [lo32] "=r"(tbl), [tmp] "=r"(tmp)); return (static_cast<int64_t>(tbu) << 32) | tbl; #endif #endif diff --git a/absl/status/CMakeLists.txt b/absl/status/CMakeLists.txt index 15db36af..4a3c5d68 100644 --- a/absl/status/CMakeLists.txt +++ b/absl/status/CMakeLists.txt @@ -25,6 +25,8 @@ absl_cc_library( "status_payload_printer.cc" COPTS ${ABSL_DEFAULT_COPTS} + DEFINES + "$<$<PLATFORM_ID:AIX>:_LINUX_SOURCE_COMPAT>" DEPS absl::atomic_hook absl::config |