From 44606a0df52c9aef879bbbd0567af571fe996329 Mon Sep 17 00:00:00 2001 From: Jürg Billeter Date: Mon, 15 May 2023 12:40:54 +0200 Subject: absl/base: Fix build on AIX The AIX assembler doesn't support numeric labels. Use a relative jump instead to fix Assembler: /tmp/ccw16WCt.s: line 25: Error In Syntax --- absl/base/internal/unscaledcycleclock.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc index b1c396c6..128dc52f 100644 --- a/absl/base/internal/unscaledcycleclock.cc +++ b/absl/base/internal/unscaledcycleclock.cc @@ -71,12 +71,11 @@ 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" + "bne $-16\n" // retry on failure : [ hi32 ] "=r"(tbu), [ lo32 ] "=r"(tbl), [ tmp ] "=r"(tmp)); return (static_cast(tbu) << 32) | tbl; #endif -- cgit v1.2.3 From 339c79d40535d5e2ea8e56dfbff76c283315f2d3 Mon Sep 17 00:00:00 2001 From: Jürg Billeter Date: Wed, 24 May 2023 09:41:02 +0200 Subject: absl/status: Fix build on AIX `_LINUX_SOURCE_COMPAT` needs to be defined to fix absl/status/status.cc:494:5: error: duplicate case value 494 | case ENOTEMPTY: // Directory not empty | ^~~~ absl/status/status.cc:480:5: note: previously used here 480 | case EEXIST: // File exists | ^~~~ --- absl/status/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) 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 + "$<$:_LINUX_SOURCE_COMPAT>" DEPS absl::atomic_hook absl::config -- cgit v1.2.3