[libcxx-commits] [PATCH] D149660: [libc++][AIX] Add OS version to target triple

[Jake Egan via Phabricator via libcxx-commits]

Jake-Egan updated this revision to Diff 554798.
Jake-Egan added a comment.

rebase


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D149660/new/

https://reviews.llvm.org/D149660

Files:
  libcxx/utils/ci/run-buildbot
  libunwind/test/signal_frame.pass.cpp


Index: libunwind/test/signal_frame.pass.cpp
===================================================================
--- libunwind/test/signal_frame.pass.cpp
+++ libunwind/test/signal_frame.pass.cpp
@@ -19,7 +19,7 @@
 
 // The AIX assembler does not support CFI directives, which
 // are necessary to run this test.
-// UNSUPPORTED: target=powerpc{{(64)?}}-ibm-aix
+// UNSUPPORTED: target={{.*}}-aix{{.*}}
 
 // Windows doesn't generally use CFI directives. However, i686
 // mingw targets do use DWARF (where CFI directives are supported).
Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -693,10 +693,21 @@
 ;;
 aix)
     clean
+
+    VERSION=$(oslevel -s | awk -F'-' '{printf "%.1f.%d.%d\n", $1/1000, $2, $3}')
+    if [ "$OBJECT_MODE" -eq 32 ]; then
+        PARAMS="target_triple=powerpc-ibm-aix${VERSION}"
+    else
+        PARAMS="target_triple=powerpc64-ibm-aix${VERSION}"
+    fi
+
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AIX.cmake" \
                    -DLIBCXX_TEST_CONFIG="ibm-libc++-shared.cfg.in" \
                    -DLIBCXXABI_TEST_CONFIG="ibm-libc++abi-shared.cfg.in" \
-                   -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in"
+                   -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in" \
+                   -DLIBCXX_TEST_PARAMS="${PARAMS}" \
+                   -DLIBCXXABI_TEST_PARAMS="${PARAMS}" \
+                   -DLIBUNWIND_TEST_PARAMS="${PARAMS}"
     check-abi-list
     check-runtimes
 ;;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D149660.554798.patch
Type: text/x-patch
Size: 1594 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230830/49af9ced/attachment.bin>