[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur reopened https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur closed https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur edited https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur updated
https://github.com/llvm/llvm-project/pull/89753
>From 470842dbe4668a22349624e69d1d3decf00b1da6 Mon Sep 17 00:00:00 2001
From: Michael Kruse
Date: Tue, 23 Apr 2024 13:15:38 +0200
Subject: [PATCH 1/2] [compiler-rt] Revise IDE folder structure
---
compiler-rt/CMakeLists.txt| 3 ++-
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 19 ++-
.../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++--
.../cmake/Modules/CompilerRTUtils.cmake | 4 ++--
compiler-rt/cmake/base-config-ix.cmake| 4 ++--
compiler-rt/include/CMakeLists.txt| 2 +-
compiler-rt/lib/asan/tests/CMakeLists.txt | 8
compiler-rt/lib/builtins/CMakeLists.txt | 2 +-
compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++---
compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++--
.../lib/interception/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++---
.../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/stats/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/dd/CMakeLists.txt| 2 +-
compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +-
compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++--
compiler-rt/test/CMakeLists.txt | 1 +
compiler-rt/test/asan/CMakeLists.txt | 3 ---
compiler-rt/test/asan_abi/CMakeLists.txt | 1 -
compiler-rt/test/builtins/CMakeLists.txt | 1 -
compiler-rt/test/cfi/CMakeLists.txt | 3 ---
compiler-rt/test/dfsan/CMakeLists.txt | 1 -
compiler-rt/test/fuzzer/CMakeLists.txt| 1 -
compiler-rt/test/gwp_asan/CMakeLists.txt | 1 -
compiler-rt/test/hwasan/CMakeLists.txt| 2 --
compiler-rt/test/interception/CMakeLists.txt | 1 -
compiler-rt/test/lsan/CMakeLists.txt | 1 -
compiler-rt/test/memprof/CMakeLists.txt | 3 ---
compiler-rt/test/metadata/CMakeLists.txt | 1 -
compiler-rt/test/msan/CMakeLists.txt | 1 -
compiler-rt/test/orc/CMakeLists.txt | 1 -
compiler-rt/test/profile/CMakeLists.txt | 1 -
compiler-rt/test/safestack/CMakeLists.txt | 1 -
.../test/sanitizer_common/CMakeLists.txt | 2 --
.../test/shadowcallstack/CMakeLists.txt | 1 -
compiler-rt/test/tsan/CMakeLists.txt | 1 -
compiler-rt/test/ubsan/CMakeLists.txt | 2 --
compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 -
compiler-rt/test/xray/CMakeLists.txt | 1 -
42 files changed, 45 insertions(+), 73 deletions(-)
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 6ce451e3cac2e..65063e0057bbc 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -4,6 +4,7 @@
# based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.20.0)
+set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE.
-set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
+set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
endif()
find_package(Python3 COMPONENTS Interpreter)
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 75b34c8e27e00..9be8ef1b362d8 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -91,7 +91,7 @@ function(add_compiler_rt_object_libraries name)
${extra_cflags_${libname}} ${target_flags})
set_property(TARGET ${libname} APPEND PROPERTY
COMPILE_DEFINITIONS ${LIB_DEFS})
-set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries")
+set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
if(APPLE)
set_target_properties(${libname} PROPERTIES
OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}")
@@ -110,7 +110,7 @@ endmacro()
function(add_compiler_rt_component name)
add_custom_target(${name})
- set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc")
+ set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Components")
if(COMMAND runtime_register_component)
runtime_register_component(${name})
endif()
@@ -293,7 +293,7 @@ function(add_compiler_rt_runtime name type)
if(NOT TARGET ${LIB_PARENT_TARGET})
add_custom_target(${LIB_PARENT_TARGET})
set_target_properties(${LIB_PARENT_TARGET} PROPERTIES
-FOLDER "Compiler-RT Misc")
+FOLDER "Compiler-RT/Runtimes")
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
llvmbot wrote:
@llvm/pr-subscribers-pgo
Author: Michael Kruse (Meinersbur)
Changes
Reviewers of #89153 suggested to break up the patch into per-subproject
patches. This is the Compiler-RT part. See #89153 for the entire series
and motivation.
Update the folder titles for targets in the monorepository that have not seen
taken care of for some time. These are the folders that targets are organized
in Visual Studio and XCode (`set_property(TARGET target PROPERTY FOLDER
"title")`) when using the respective CMake's IDE generator.
* Ensure that every target is in a folder
* Use a folder hierarchy with each LLVM subproject as a top-level folder
* Use consistent folder names between subprojects
* When using target-creating functions from AddLLVM.cmake, automatically
deduce the folder. This reduces the number of
`set_property`/`set_target_property`, but are still necessary when
`add_custom_target`, `add_executable`, `add_library`, etc. are used. A
LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's root
CMakeLists.txt.
---
Patch is 31.58 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/89753.diff
42 Files Affected:
- (modified) compiler-rt/CMakeLists.txt (+2-1)
- (modified) compiler-rt/cmake/Modules/AddCompilerRT.cmake (+10-9)
- (modified) compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake (+2-2)
- (modified) compiler-rt/cmake/Modules/CompilerRTUtils.cmake (+2-2)
- (modified) compiler-rt/cmake/base-config-ix.cmake (+2-2)
- (modified) compiler-rt/include/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/asan/tests/CMakeLists.txt (+4-4)
- (modified) compiler-rt/lib/builtins/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/fuzzer/tests/CMakeLists.txt (+3-3)
- (modified) compiler-rt/lib/gwp_asan/tests/CMakeLists.txt (+2-2)
- (modified) compiler-rt/lib/interception/tests/CMakeLists.txt (+2-2)
- (modified) compiler-rt/lib/memprof/tests/CMakeLists.txt (+2-2)
- (modified) compiler-rt/lib/orc/tests/CMakeLists.txt (+3-3)
- (modified) compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt (+2-2)
- (modified) compiler-rt/lib/stats/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/tsan/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/tsan/dd/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/tsan/rtl/CMakeLists.txt (+1-1)
- (modified) compiler-rt/lib/xray/tests/CMakeLists.txt (+2-2)
- (modified) compiler-rt/test/CMakeLists.txt (+1)
- (modified) compiler-rt/test/asan/CMakeLists.txt (-3)
- (modified) compiler-rt/test/asan_abi/CMakeLists.txt (-1)
- (modified) compiler-rt/test/builtins/CMakeLists.txt (-1)
- (modified) compiler-rt/test/cfi/CMakeLists.txt (-3)
- (modified) compiler-rt/test/dfsan/CMakeLists.txt (-1)
- (modified) compiler-rt/test/fuzzer/CMakeLists.txt (-1)
- (modified) compiler-rt/test/gwp_asan/CMakeLists.txt (-1)
- (modified) compiler-rt/test/hwasan/CMakeLists.txt (-2)
- (modified) compiler-rt/test/interception/CMakeLists.txt (-1)
- (modified) compiler-rt/test/lsan/CMakeLists.txt (-1)
- (modified) compiler-rt/test/memprof/CMakeLists.txt (-3)
- (modified) compiler-rt/test/metadata/CMakeLists.txt (-1)
- (modified) compiler-rt/test/msan/CMakeLists.txt (-1)
- (modified) compiler-rt/test/orc/CMakeLists.txt (-1)
- (modified) compiler-rt/test/profile/CMakeLists.txt (-1)
- (modified) compiler-rt/test/safestack/CMakeLists.txt (-1)
- (modified) compiler-rt/test/sanitizer_common/CMakeLists.txt (-2)
- (modified) compiler-rt/test/shadowcallstack/CMakeLists.txt (-1)
- (modified) compiler-rt/test/tsan/CMakeLists.txt (-1)
- (modified) compiler-rt/test/ubsan/CMakeLists.txt (-2)
- (modified) compiler-rt/test/ubsan_minimal/CMakeLists.txt (-1)
- (modified) compiler-rt/test/xray/CMakeLists.txt (-1)
``diff
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 6ce451e3cac2e..65063e0057bbc 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -4,6 +4,7 @@
# based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.20.0)
+set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE.
-set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
+set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
endif()
find_package(Python3 COMPONENTS Interpreter)
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 6e0d9dbff65a9..902e26dcbb882 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -97,7 +97,7 @@ function(add_compiler_rt_object_libraries
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89753 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
@@ -89,15 +89,15 @@ function(add_compiler_rt_object_libraries name)
"${libname}" MATCHES ".*\.osx.*")
foreach(arch ${LIB_ARCHS_${libname}})
list(APPEND target_flags
- "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
+ "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
Meinersbur wrote:
This was not intentional. It is possible that I was trying to jump to line 357
and instead typed into the edited. I always look for unnecessary changes before
pushing but seem to have missed this one.
Thanks for noticing.
https://github.com/llvm/llvm-project/pull/89753
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur updated
https://github.com/llvm/llvm-project/pull/89753
>From 19ef183fcfb44fa8b9bae34bdc8eafb8d2425722 Mon Sep 17 00:00:00 2001
From: Michael Kruse
Date: Tue, 23 Apr 2024 13:15:38 +0200
Subject: [PATCH 1/2] [compiler-rt] Revise IDE folder structure
---
compiler-rt/CMakeLists.txt| 3 ++-
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 21 ++-
.../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++--
.../cmake/Modules/CompilerRTUtils.cmake | 4 ++--
compiler-rt/cmake/base-config-ix.cmake| 4 ++--
compiler-rt/include/CMakeLists.txt| 2 +-
compiler-rt/lib/asan/tests/CMakeLists.txt | 8 +++
compiler-rt/lib/builtins/CMakeLists.txt | 2 +-
compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++---
compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++--
.../lib/interception/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++---
.../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/stats/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/dd/CMakeLists.txt| 2 +-
compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +-
compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++--
compiler-rt/test/CMakeLists.txt | 1 +
compiler-rt/test/asan/CMakeLists.txt | 3 ---
compiler-rt/test/asan_abi/CMakeLists.txt | 1 -
compiler-rt/test/builtins/CMakeLists.txt | 1 -
compiler-rt/test/cfi/CMakeLists.txt | 3 ---
compiler-rt/test/dfsan/CMakeLists.txt | 1 -
compiler-rt/test/fuzzer/CMakeLists.txt| 1 -
compiler-rt/test/gwp_asan/CMakeLists.txt | 1 -
compiler-rt/test/hwasan/CMakeLists.txt| 2 --
compiler-rt/test/interception/CMakeLists.txt | 1 -
compiler-rt/test/lsan/CMakeLists.txt | 1 -
compiler-rt/test/memprof/CMakeLists.txt | 3 ---
compiler-rt/test/metadata/CMakeLists.txt | 1 -
compiler-rt/test/msan/CMakeLists.txt | 1 -
compiler-rt/test/orc/CMakeLists.txt | 1 -
compiler-rt/test/profile/CMakeLists.txt | 1 -
compiler-rt/test/safestack/CMakeLists.txt | 1 -
.../test/sanitizer_common/CMakeLists.txt | 2 --
.../test/shadowcallstack/CMakeLists.txt | 1 -
compiler-rt/test/tsan/CMakeLists.txt | 1 -
compiler-rt/test/ubsan/CMakeLists.txt | 2 --
compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 -
compiler-rt/test/xray/CMakeLists.txt | 1 -
42 files changed, 46 insertions(+), 74 deletions(-)
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 6ce451e3cac2e3..65063e0057bbca 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -4,6 +4,7 @@
# based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.20.0)
+set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE.
-set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
+set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
endif()
find_package(Python3 COMPONENTS Interpreter)
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 6e0d9dbff65a9e..61c727b36bff30 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -89,7 +89,7 @@ function(add_compiler_rt_object_libraries name)
"${libname}" MATCHES ".*\.osx.*")
foreach(arch ${LIB_ARCHS_${libname}})
list(APPEND target_flags
- "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
+ "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
endforeach()
endif()
@@ -97,7 +97,7 @@ function(add_compiler_rt_object_libraries name)
${extra_cflags_${libname}} ${target_flags})
set_property(TARGET ${libname} APPEND PROPERTY
COMPILE_DEFINITIONS ${LIB_DEFS})
-set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries")
+set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
if(APPLE)
set_target_properties(${libname} PROPERTIES
OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}")
@@ -116,7 +116,7 @@ endmacro()
function(add_compiler_rt_component name)
add_custom_target(${name})
- set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc")
+
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
@@ -89,15 +89,15 @@ function(add_compiler_rt_object_libraries name)
"${libname}" MATCHES ".*\.osx.*")
foreach(arch ${LIB_ARCHS_${libname}})
list(APPEND target_flags
- "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
+ "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER}
-darwin-target-variant ${arch}-apple-ios13.1-macabi")
dtellenbach wrote:
What's the reason for this?
https://github.com/llvm/llvm-project/pull/89753
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [compiler-rt] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur created
https://github.com/llvm/llvm-project/pull/89753
Reviewers of #89153 suggested to break up the patch into per-subproject
patches. This is the Compiler-RT part. See #89153 for the entire series and
motivation.
Update the folder titles for targets in the monorepository that have not seen
taken care of for some time. These are the folders that targets are organized
in Visual Studio and XCode (`set_property(TARGET PROPERTY FOLDER
"")`) when using the respective CMake's IDE generator.
* Ensure that every target is in a folder
* Use a folder hierarchy with each LLVM subproject as a top-level folder
* Use consistent folder names between subprojects
* When using target-creating functions from AddLLVM.cmake, automatically
deduce the folder. This reduces the number of
`set_property`/`set_target_property`, but are still necessary when
`add_custom_target`, `add_executable`, `add_library`, etc. are used. A
LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's root
CMakeLists.txt.
>From 19ef183fcfb44fa8b9bae34bdc8eafb8d2425722 Mon Sep 17 00:00:00 2001
From: Michael Kruse
Date: Tue, 23 Apr 2024 13:15:38 +0200
Subject: [PATCH] [compiler-rt] Revise IDE folder structure
---
compiler-rt/CMakeLists.txt| 3 ++-
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 21 ++-
.../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++--
.../cmake/Modules/CompilerRTUtils.cmake | 4 ++--
compiler-rt/cmake/base-config-ix.cmake| 4 ++--
compiler-rt/include/CMakeLists.txt| 2 +-
compiler-rt/lib/asan/tests/CMakeLists.txt | 8 +++
compiler-rt/lib/builtins/CMakeLists.txt | 2 +-
compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++---
compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++--
.../lib/interception/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++---
.../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++--
compiler-rt/lib/stats/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/CMakeLists.txt | 2 +-
compiler-rt/lib/tsan/dd/CMakeLists.txt| 2 +-
compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +-
compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++--
compiler-rt/test/CMakeLists.txt | 1 +
compiler-rt/test/asan/CMakeLists.txt | 3 ---
compiler-rt/test/asan_abi/CMakeLists.txt | 1 -
compiler-rt/test/builtins/CMakeLists.txt | 1 -
compiler-rt/test/cfi/CMakeLists.txt | 3 ---
compiler-rt/test/dfsan/CMakeLists.txt | 1 -
compiler-rt/test/fuzzer/CMakeLists.txt| 1 -
compiler-rt/test/gwp_asan/CMakeLists.txt | 1 -
compiler-rt/test/hwasan/CMakeLists.txt| 2 --
compiler-rt/test/interception/CMakeLists.txt | 1 -
compiler-rt/test/lsan/CMakeLists.txt | 1 -
compiler-rt/test/memprof/CMakeLists.txt | 3 ---
compiler-rt/test/metadata/CMakeLists.txt | 1 -
compiler-rt/test/msan/CMakeLists.txt | 1 -
compiler-rt/test/orc/CMakeLists.txt | 1 -
compiler-rt/test/profile/CMakeLists.txt | 1 -
compiler-rt/test/safestack/CMakeLists.txt | 1 -
.../test/sanitizer_common/CMakeLists.txt | 2 --
.../test/shadowcallstack/CMakeLists.txt | 1 -
compiler-rt/test/tsan/CMakeLists.txt | 1 -
compiler-rt/test/ubsan/CMakeLists.txt | 2 --
compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 -
compiler-rt/test/xray/CMakeLists.txt | 1 -
42 files changed, 46 insertions(+), 74 deletions(-)
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 6ce451e3cac2e3..65063e0057bbca 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -4,6 +4,7 @@
# based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.20.0)
+set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
if (TARGET intrinsics_gen)
# Loading the llvm config causes this target to be imported so place it
# under the appropriate folder in an IDE.
-set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
+set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
endif()
find_package(Python3 COMPONENTS Interpreter)
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 6e0d9dbff65a9e..61c727b36bff30 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -89,7 +89,7 @@ function(add_compiler_rt_object_libraries name)
"${libname}" MATCHES ".*\.osx.*")
foreach(arch ${LIB_ARCHS_${libname}})
list(APPEND target_flags
-
