[libcxx-commits] [PATCH] D113403: [libcxx][CI][AIX] Switch to LLVM_ENABLE_RUNTIMES

[David Tenty via Phabricator via libcxx-commits]

daltenty updated this revision to Diff 385786.
daltenty added a comment.
Herald added a subscriber: mgorny.
Herald added a project: libc++abi.
Herald added a reviewer: libc++abi.

- [libcxxabi] Avoid the VMX malloc to vec_malloc mapping
- Un-XFAIL test fixed by the more narrowly application of XOPEN_SOURCE macros


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D113403

Files:
  libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
  libcxx/utils/ci/run-buildbot
  libcxxabi/CMakeLists.txt


Index: libcxxabi/CMakeLists.txt
===================================================================
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -519,6 +519,12 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXXABI_CXX_FLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
 
+# On AIX, avoid picking up VMX extensions(i.e. vec_malloc) which would change
+# the default alignment of the allocators here.
+if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+  add_definitions("-D_XOPEN_SOURCE=700")
+endif()
+
 #===============================================================================
 # Setup Source Code
 #===============================================================================
Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -115,8 +115,7 @@
 
 function generate-cmake-aix() {
     generate-cmake-base \
-          -S "${MONOREPO_ROOT}/llvm" \
-          -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
+          -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
           "${@}"
 }
 
Index: libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
+++ libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // UNSUPPORTED: libcpp-has-no-threads
-// XFAIL: LIBCXX-AIX-FIXME
 
 // <thread>
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113403.385786.patch
Type: text/x-patch
Size: 1744 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20211109/06b4be7d/attachment-0001.bin>