[AIX][compiler-rt] Use the AR/ranlib mode flag for 32-bit and 64-bit mode

[daltenty]

Summary

since we will be building both 32-bit and 64-bit compiler-rt builtins
from a single configuration.

[daltenty]

• Add AR flags to the builtins CMake too since it may be used as a toplevel by the runtimes build

[hubert.reinterpretcast]

since we will be building both 32-bit and 64-bit compiler-rt builtins
from a single configuration.

@daltenty, from the limited context of this patch, this sounds questionable in terms of avoiding silent errors now and in the future. If the idea is to configure once and then run twice in the same build tree, then some things may get cached either in CMake or in generated headers, etc.

Would the 32-bit and 64-bit objects be built into different directories during the CMake build process?

It also seems like CMake needs to be run twice with a different OBJECT_MODE setting in the environment.

compiler-rt/CMakeLists.txt

503–504

Remove extra spaces.

compiler-rt/lib/builtins/CMakeLists.txt

31–32

Remove extra spaces.

[daltenty]

In D87113#2266807, @hubert.reinterpretcast wrote:

since we will be building both 32-bit and 64-bit compiler-rt builtins
from a single configuration.

@daltenty, from the limited context of this patch, this sounds questionable in terms of avoiding silent errors now and in the future. If the idea is to configure once and then run twice in the same build tree, then some things may get cached either in CMake or in generated headers, etc.

Compiler-rt supports generating multiple targets from a single configuration. By default the compiler-rt build process will figure out the supported arches and generate different targets for the powerpc and powerpc64 objects, so there is only one real run.

The problem is that the CMake configuration doesn't really expect to need seperate AR flags for these targets and the environment OBJECT_MODE flag may not reflect what is actually being generated. I agree this is a bit of a blunt solution, but I'm not sure how much value we'd really get from being more specific with the mode flags (and it may hurt us if we want to start doing combined archives)

Would the 32-bit and 64-bit objects be built into different directories during the CMake build process?

That actually depends on the LLVM_ENABLE_PER_TARGET_RUNTIME_DIR setting, see D45604. My assumption was AIX would adopt the traditional single directory layout similar to BSD / Solaris and friends, but I'll be putting up another PR to establish that default so that's definitely open for discussion.

It also seems like CMake needs to be run twice with a different OBJECT_MODE setting in the environment.

As noted above, it seems a single compiler-rt configuration may be expected to build for multiple targets, regardless of the default target / OBJECT_MODE setting.

[daltenty]

• Fix whitespace and indentation

[hubert.reinterpretcast]

LGTM; thanks.

In D87113#2279690, @daltenty wrote:

Compiler-rt supports generating multiple targets from a single configuration. By default the compiler-rt build process will figure out the supported arches and generate different targets for the powerpc and powerpc64 objects, so there is only one real run.

Okay, I think I get it. With Clang as the build compiler, the target triple encodes the address mode. The compiler driver takes care of the object mode for compiling and linking.

compiler-rt/CMakeLists.txt

if (CMAKE_LINKER MATCHES "link.exe$")
   # files, rather than skipping these files in the build system.
   # Ideally, we would pass this flag only for the libraries that need
   # it, but CMake doesn't seem to have a way to set linker flags for
   # individual static libraries, so we enable the suppression flag for
   # the whole compiler-rt project.
   set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221")
 endif()
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> -X32_64 qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> -X32_64 qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> -X32_64 q  <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> -X32_64 q  <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -X32_64 <TARGET>")
+    set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -X32_64 <TARGET>")
+endif()
+
 add_subdirectory(include)
 
 option(COMPILER_RT_USE_LIBCXX
   "Enable compiler-rt to use libc++ from the source tree" ON)
 if(COMPILER_RT_USE_LIBCXX)
   if(LLVM_ENABLE_PROJECTS_USED)
     # Don't use libcxx if LLVM_ENABLE_PROJECTS does not enable it.
     set(COMPILER_RT_LIBCXX_PATH ${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR})

compiler-rt/lib/builtins/CMakeLists.txt

if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
   if(APPLE)
     include(CompilerRTDarwinUtils)
   endif()
   if(APPLE)
     include(UseLibtool)
   endif()
   include(AddCompilerRT)
+
+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> -X32_64 qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> -X32_64 qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> -X32_64 q  <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> -X32_64 q  <TARGET> <LINK_FLAGS> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -X32_64 <TARGET>")
+    set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -X32_64 <TARGET>")
+  endif()
 endif()
 
 if (COMPILER_RT_STANDALONE_BUILD)
   # When compiler-rt is being built standalone, possibly as a cross-compilation
   # target, the target may or may not want position independent code. This
   # option provides an avenue through which the flag may be controlled when an
   # LLVM configuration is not being utilized.
   option(COMPILER_RT_BUILTINS_ENABLE_PIC