[libcxx-commits] [PATCH] D126017: [libunwind][ci][AIX] Add libunwind to buildbot CI

[Xing Xue via Phabricator via libcxx-commits]

xingxue updated this revision to Diff 430993.
xingxue edited the summary of this revision.
xingxue added a comment.

Rebased and picked up the change in D125981 <https://reviews.llvm.org/D125981> which introduces the cmake-bridge.cfg.in file to reduce the libunwind test config duplication.  Thanks, @ldionne!


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D126017

Files:
  libcxx/cmake/caches/AIX.cmake
  libcxx/utils/ci/run-buildbot
  libunwind/test/configs/ibm-libunwind-shared.cfg.in


Index: libunwind/test/configs/ibm-libunwind-shared.cfg.in
===================================================================
--- /dev/null
+++ libunwind/test/configs/ibm-libunwind-shared.cfg.in
@@ -0,0 +1,26 @@
+#
+# Configuration file for running the libunwind tests on AIX.
+#
+
+lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
+
+config.substitutions.append(('%{flags}', ''))
+config.substitutions.append(('%{compile_flags}',
+    '-nostdinc++ -I %{include} -I %{cxx-include}'
+))
+config.substitutions.append(('%{link_flags}',
+    '-nostdlib++ -L %{lib} -lunwind -ldl -Wl,-bbigtoc'
+))
+config.substitutions.append(('%{exec}',
+    '%{executor} --execdir %T --env LIBPATH=%{lib} -- '
+))
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
+libcxx.test.newconfig.configure(
+    libcxx.test.params.DEFAULT_PARAMETERS,
+    libcxx.test.features.DEFAULT_FEATURES,
+    config,
+    lit_config
+)
Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -603,10 +603,10 @@
     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" \
-                   -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"
-    # TODO: use check-runtimes once libunwind builds cleanly on AIX.
-    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi
-    ${NINJA} -vC "${BUILD_DIR}" check-cxx check-cxxabi
+                   -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in" \
+                   -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind"
+    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi install-unwind
+    check-runtimes
 ;;
 #################################################################
 # Insert vendor-specific internal configurations below.
Index: libcxx/cmake/caches/AIX.cmake
===================================================================
--- libcxx/cmake/caches/AIX.cmake
+++ libcxx/cmake/caches/AIX.cmake
@@ -14,3 +14,6 @@
 set(LIBCXXABI_ENABLE_SHARED ON CACHE BOOL "")
 set(LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
+set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
+set(LIBUNWIND_ENABLE_SHARED ON CACHE BOOL "")
+set(LIBUNWIND_ENABLE_STATIC OFF CACHE BOOL "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D126017.430993.patch
Type: text/x-patch
Size: 2547 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220520/40094065/attachment.bin>