Skip to content

Conversation

@jakeegan
Copy link
Member

This makes it more clear that these lists are AIX-specific.

@jakeegan jakeegan marked this pull request as ready for review June 26, 2025 17:35
@llvmbot
Copy link
Member

llvmbot commented Jun 26, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Jake Egan (jakeegan)

Changes

This makes it more clear that these lists are AIX-specific.


Full diff: https://github.com/llvm/llvm-project/pull/145936.diff

3 Files Affected:

  • (modified) compiler-rt/cmake/Modules/AddCompilerRT.cmake (+1-1)
  • (renamed) compiler-rt/lib/asan/AIX/asan.link_with_main_exec.txt ()
  • (renamed) compiler-rt/lib/asan/AIX/asan_cxx.link_with_main_exec.txt ()
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 45a2f5c0a61fc..9a0426ff29470 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -584,7 +584,7 @@ endmacro(add_compiler_rt_script src name)
 
 
 macro(add_compiler_rt_cfg target_name file_name component arch)
-  set(src_file "${CMAKE_CURRENT_SOURCE_DIR}/${file_name}")
+  set(src_file "${CMAKE_CURRENT_SOURCE_DIR}/AIX/${file_name}")
   get_compiler_rt_output_dir(${arch} output_dir)
   set(dst_file "${output_dir}/${file_name}")
   add_custom_command(OUTPUT ${dst_file}
diff --git a/compiler-rt/lib/asan/asan.link_with_main_exec.txt b/compiler-rt/lib/asan/AIX/asan.link_with_main_exec.txt
similarity index 100%
rename from compiler-rt/lib/asan/asan.link_with_main_exec.txt
rename to compiler-rt/lib/asan/AIX/asan.link_with_main_exec.txt
diff --git a/compiler-rt/lib/asan/asan_cxx.link_with_main_exec.txt b/compiler-rt/lib/asan/AIX/asan_cxx.link_with_main_exec.txt
similarity index 100%
rename from compiler-rt/lib/asan/asan_cxx.link_with_main_exec.txt
rename to compiler-rt/lib/asan/AIX/asan_cxx.link_with_main_exec.txt

Copy link
Collaborator

@hubert-reinterpretcast hubert-reinterpretcast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; however, I don't know if there is any particular preference for avoiding the all-caps AIX in the pathname.

@jakeegan
Copy link
Member Author

jakeegan commented Jul 8, 2025

I went that route since the platforms in the test directory are capitalized, but we'll see if @vitalybuka has a preference.

@jakeegan jakeegan merged commit 875581b into llvm:main Jul 8, 2025
13 checks passed
@jakeegan jakeegan deleted the asan_lists branch July 8, 2025 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants