Skip to content

Commit 470842d

Browse files
MeinersburMeinersbur
committed
[compiler-rt] Revise IDE folder structure
1 parent 0e864bb commit 470842d

File tree

42 files changed

+45
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+45
-73
lines changed

‎compiler-rt/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# based on the ability of the host toolchain to target various platforms.
55

66
cmake_minimum_required(VERSION 3.20.0)
7+
set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
78

89
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
910
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -90,7 +91,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
9091
if (TARGET intrinsics_gen)
9192
# Loading the llvm config causes this target to be imported so place it
9293
# under the appropriate folder in an IDE.
93-
set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
94+
set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
9495
endif()
9596

9697
find_package(Python3 COMPONENTS Interpreter)

‎compiler-rt/cmake/Modules/AddCompilerRT.cmake‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function(add_compiler_rt_object_libraries name)
9191
${extra_cflags_${libname}} ${target_flags})
9292
set_property(TARGET ${libname} APPEND PROPERTY
9393
COMPILE_DEFINITIONS ${LIB_DEFS})
94-
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries")
94+
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
9595
if(APPLE)
9696
set_target_properties(${libname} PROPERTIES
9797
OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}")
@@ -110,7 +110,7 @@ endmacro()
110110

111111
function(add_compiler_rt_component name)
112112
add_custom_target(${name})
113-
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc")
113+
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Components")
114114
if(COMMAND runtime_register_component)
115115
runtime_register_component(${name})
116116
endif()
@@ -293,7 +293,7 @@ function(add_compiler_rt_runtime name type)
293293
if(NOT TARGET ${LIB_PARENT_TARGET})
294294
add_custom_target(${LIB_PARENT_TARGET})
295295
set_target_properties(${LIB_PARENT_TARGET} PROPERTIES
296-
FOLDER "Compiler-RT Misc")
296+
FOLDER "Compiler-RT/Runtimes")
297297
endif()
298298
endif()
299299

@@ -348,6 +348,7 @@ function(add_compiler_rt_runtime name type)
348348
DEPENDS ${sources_${libname}}
349349
COMMENT "Building C object ${output_file_${libname}}")
350350
add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
351+
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Codegenning")
351352
install(FILES ${output_dir_${libname}}/${output_file_${libname}}
352353
DESTINATION ${install_dir_${libname}}
353354
${COMPONENT_OPTION})
@@ -370,8 +371,8 @@ function(add_compiler_rt_runtime name type)
370371
add_dependencies(${libname} ${LIB_DEPS})
371372
endif()
372373
set_target_properties(${libname} PROPERTIES
373-
OUTPUT_NAME ${output_name_${libname}})
374-
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")
374+
OUTPUT_NAME ${output_name_${libname}}
375+
FOLDER "Compiler-RT/Runtimes")
375376
if(LIB_LINK_LIBS)
376377
target_link_libraries(${libname} PRIVATE ${LIB_LINK_LIBS})
377378
endif()
@@ -538,7 +539,7 @@ function(add_compiler_rt_test test_suite test_name arch)
538539
DEPENDS ${TEST_DEPS}
539540
)
540541
add_custom_target(T${test_name} DEPENDS "${output_bin}")
541-
set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT Tests")
542+
set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT/Tests")
542543

543544
# Make the test suite depend on the binary.
544545
add_dependencies(${test_suite} T${test_name})
@@ -558,7 +559,7 @@ macro(add_compiler_rt_resource_file target_name file_name component)
558559
COMPONENT ${component})
559560
add_dependencies(${component} ${target_name})
560561

561-
set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc")
562+
set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT/Resources")
562563
endmacro()
563564

564565
macro(add_compiler_rt_script name)
@@ -607,7 +608,7 @@ macro(add_custom_libcxx name prefix)
607608
COMMENT "Clobbering ${name} build directories"
608609
USES_TERMINAL
609610
)
610-
set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT Misc")
611+
set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT/Meta")
611612

612613
add_custom_command(
613614
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp
@@ -619,7 +620,7 @@ macro(add_custom_libcxx name prefix)
619620

620621
add_custom_target(${name}-clobber
621622
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp)
622-
set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT Misc")
623+
set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT/Meta")
623624

624625
set(PASSTHROUGH_VARIABLES
625626
ANDROID

‎compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ macro(darwin_add_builtin_library name suffix)
336336

337337
list(APPEND ${LIB_OS}_${suffix}_libs ${libname})
338338
list(APPEND ${LIB_OS}_${suffix}_lipo_flags -arch ${arch} $<TARGET_FILE:${libname}>)
339-
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries")
339+
set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries")
340340
endmacro()
341341

342342
function(darwin_lipo_libs name)
@@ -355,7 +355,7 @@ function(darwin_lipo_libs name)
355355
)
356356
add_custom_target(${name}
357357
DEPENDS ${LIB_OUTPUT_DIR}/lib${name}.a)
358-
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc")
358+
set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Misc")
359359
add_dependencies(${LIB_PARENT_TARGET} ${name})
360360

361361
if(CMAKE_CONFIGURATION_TYPES)

‎compiler-rt/cmake/Modules/CompilerRTUtils.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,9 @@ function(add_compiler_rt_install_targets name)
546546
-DCMAKE_INSTALL_DO_STRIP=1
547547
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
548548
set_target_properties(install-${ARG_PARENT_TARGET} PROPERTIES
549-
FOLDER "Compiler-RT Misc")
549+
FOLDER "Compiler-RT/Installation")
550550
set_target_properties(install-${ARG_PARENT_TARGET}-stripped PROPERTIES
551-
FOLDER "Compiler-RT Misc")
551+
FOLDER "Compiler-RT/Installation")
552552
add_dependencies(install-compiler-rt install-${ARG_PARENT_TARGET})
553553
add_dependencies(install-compiler-rt-stripped install-${ARG_PARENT_TARGET}-stripped)
554554
endif()

‎compiler-rt/cmake/base-config-ix.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ endif()
2323
add_custom_target(compiler-rt ALL)
2424
add_custom_target(install-compiler-rt)
2525
add_custom_target(install-compiler-rt-stripped)
26+
set_property(TARGET compiler-rt PROPERTY FOLDER "Compiler-RT/Metatargets")
2627
set_property(
2728
TARGET
28-
compiler-rt
2929
install-compiler-rt
3030
install-compiler-rt-stripped
3131
PROPERTY
32-
FOLDER "Compiler-RT Misc"
32+
FOLDER "Compiler-RT/Installation"
3333
)
3434

3535
# Setting these variables from an LLVM build is sufficient that compiler-rt can

‎compiler-rt/include/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ endforeach( f )
7979

8080
add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files})
8181
add_dependencies(compiler-rt compiler-rt-headers)
82-
set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")
82+
set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT/Resources")
8383

8484
# Install sanitizer headers.
8585
install(FILES ${SANITIZER_HEADERS}

‎compiler-rt/lib/asan/tests/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ append_list_if(COMPILER_RT_HAS_LIBLOG log ASAN_UNITTEST_NOINST_LIBS)
118118

119119
# Main AddressSanitizer unit tests.
120120
add_custom_target(AsanUnitTests)
121-
set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
121+
set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
122122

123123
# AddressSanitizer unit tests with dynamic runtime (on platforms where it's
124124
# not the default).
125125
add_custom_target(AsanDynamicUnitTests)
126-
set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
126+
set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
127127
# ASan benchmarks (not actively used now).
128128
add_custom_target(AsanBenchmarks)
129-
set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT Tests")
129+
set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT/Tests")
130130

131131
set(ASAN_NOINST_TEST_SOURCES
132132
${COMPILER_RT_GTEST_SOURCE}
@@ -278,7 +278,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
278278
add_library(${ASAN_TEST_RUNTIME} STATIC ${ASAN_TEST_RUNTIME_OBJECTS})
279279
set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES
280280
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
281-
FOLDER "Compiler-RT Runtime tests")
281+
FOLDER "Compiler-RT/Tests/Runtime")
282282

283283
add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-inline")
284284
add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-calls"

‎compiler-rt/lib/builtins/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ set(ve_SOURCES
750750
${GENERIC_SOURCES})
751751

752752
add_custom_target(builtins)
753-
set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT Misc")
753+
set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT/Metatargets")
754754

755755
option(COMPILER_RT_ENABLE_SOFTWARE_INT128
756756
"Enable the int128 builtin routines for all targets."

‎compiler-rt/lib/fuzzer/tests/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if (APPLE)
1212
endif()
1313

1414
add_custom_target(FuzzerUnitTests)
15-
set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
15+
set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
1616

1717
add_custom_target(FuzzedDataProviderUnitTests)
18-
set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
18+
set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
1919

2020
set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
2121
list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++)
@@ -58,7 +58,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH)
5858
${LIBFUZZER_TEST_RUNTIME_OBJECTS})
5959
set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES
6060
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
61-
FOLDER "Compiler-RT Runtime tests")
61+
FOLDER "Compiler-RT/Tests/Runtime")
6262

6363
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
6464
COMPILER_RT_LIBCXX_PATH AND

‎compiler-rt/lib/gwp_asan/tests/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ set(GWP_ASAN_UNIT_TEST_HEADERS
3535
harness.h)
3636

3737
add_custom_target(GwpAsanUnitTests)
38-
set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
38+
set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests")
3939

4040
set(GWP_ASAN_UNITTEST_LINK_FLAGS
4141
${COMPILER_RT_UNITTEST_LINK_FLAGS} -ldl
@@ -67,7 +67,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH)
6767

6868
set_target_properties(${GWP_ASAN_TEST_RUNTIME} PROPERTIES
6969
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
70-
FOLDER "Compiler-RT Runtime tests")
70+
FOLDER "Compiler-RT/Tests/Runtime")
7171

7272
set(GwpAsanTestObjects)
7373
generate_compiler_rt_tests(GwpAsanTestObjects

0 commit comments

Comments
 (0)