diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -482,6 +482,15 @@ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221") endif() +if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") + set(CMAKE_C_ARCHIVE_CREATE " -X32_64 qc ") + set(CMAKE_CXX_ARCHIVE_CREATE " -X32_64 qc ") + set(CMAKE_C_ARCHIVE_APPEND " -X32_64 q ") + set(CMAKE_CXX_ARCHIVE_APPEND " -X32_64 q ") + set(CMAKE_C_ARCHIVE_FINISH " -X32_64 ") + set(CMAKE_CXX_ARCHIVE_FINISH " -X32_64 ") +endif() + add_subdirectory(include) option(COMPILER_RT_USE_LIBCXX diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -24,6 +24,15 @@ include(UseLibtool) endif() include(AddCompilerRT) + + if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") + set(CMAKE_C_ARCHIVE_CREATE " -X32_64 qc ") + set(CMAKE_CXX_ARCHIVE_CREATE " -X32_64 qc ") + set(CMAKE_C_ARCHIVE_APPEND " -X32_64 q ") + set(CMAKE_CXX_ARCHIVE_APPEND " -X32_64 q ") + set(CMAKE_C_ARCHIVE_FINISH " -X32_64 ") + set(CMAKE_CXX_ARCHIVE_FINISH " -X32_64 ") + endif() endif() if (COMPILER_RT_STANDALONE_BUILD)