From dbe070eb3e09b04f312b238c40e016b97dacbbd2 Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Tue, 6 May 2025 14:14:16 -0500 Subject: [PATCH] [Offload] Fix PowerPC builds that pass -mcpu (#138327) Summary: Another hacky fix done until https://github.com/llvm/llvm-project/pull/136729 lands. This time for `-mcpu`. --- offload/DeviceRTL/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/offload/DeviceRTL/CMakeLists.txt b/offload/DeviceRTL/CMakeLists.txt index 13ea50f03bf4..4dd0daede80b 100644 --- a/offload/DeviceRTL/CMakeLists.txt +++ b/offload/DeviceRTL/CMakeLists.txt @@ -132,9 +132,12 @@ function(compileDeviceRTLLibrary target_name target_triple) BUILD_RPATH "" INSTALL_RPATH "" RUNTIME_OUTPUT_NAME libomptarget-${target_name}.bc) - target_compile_options(libomptarget-${target_name} PRIVATE "--target=${target_triple}" "-fuse-ld=lld" "-march=") + target_compile_options(libomptarget-${target_name} PRIVATE + "--target=${target_triple}" "-fuse-ld=lld" "-march=" "-mcpu=" + "-Wno-unused-command-line-argument") target_link_options(libomptarget-${target_name} PRIVATE "--target=${target_triple}" - "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=") + "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" + "-fuse-ld=lld" "-march=" "-mcpu=") install(TARGETS libomptarget-${target_name} PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}") @@ -153,7 +156,8 @@ function(compileDeviceRTLLibrary target_name target_triple) ) target_link_libraries(omptarget.${target_name} PRIVATE omptarget.${target_name}.all_objs) target_link_options(omptarget.${target_name} PRIVATE "--target=${target_triple}" - "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=") + "-Wno-unused-command-line-argument""-r" "-nostdlib" "-flto" + "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=" "-mcpu=") install(TARGETS omptarget.${target_name} ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}")