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

[David Tenty via Phabricator via libcxx-commits]

daltenty added inline comments.


================
Comment at: libcxx/utils/ci/run-buildbot:116-120
 function generate-cmake-aix() {
     generate-cmake-base \
-          -S "${MONOREPO_ROOT}/llvm" \
-          -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
+          -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
           "${@}"
 }
----------------
ldionne wrote:
> Can we get rid of `generate-cmake-aix` entirely since it is only used in one place?
I think that makes sense, since these defines should be just last option wins, I'll move this in to the AIX block itself.


================
Comment at: libcxxabi/CMakeLists.txt:522-526
+# 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()
----------------
ldionne wrote:
> Is this a different workaround for https://reviews.llvm.org/D112168?
Precisely, the XOPEN_SOURCE macro suppresses the malloc to vec_malloc mapping in the system header, so we don't see the problematic redefinition and corresponding alignment change (at least in libcxxabi where it causes the most disruption to existing applications).


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D113403