Skip to content

Commit

Permalink
[ORC-RT] Drop the 'clang_rt.' prefix from the ORC runtime.
Browse files Browse the repository at this point in the history
The ORC runtime isn't used by clang -- the prefix was just cargo-culted with
the rest of the XRay config when the ORC runtime was introduced. We now want to
make parts of it available for clients to link directly, so this seems like a
good time to fix the name.
  • Loading branch information
lhames committed Sep 12, 2022
1 parent 455aff7 commit a85e4aa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compiler-rt/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ endif(COMPILER_RT_BUILD_XRAY)

if (COMPILER_RT_BUILD_ORC)
set(ORC_HEADERS
orc/c_api.h
orc_rt/c_api.h
)
endif(COMPILER_RT_BUILD_ORC)

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions compiler-rt/lib/orc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if (APPLE)
CFLAGS ${ORC_CFLAGS}
DEPS ${ORC_DEPS})

add_compiler_rt_runtime(clang_rt.orc
add_compiler_rt_runtime(orc_rt
STATIC
OS ${ORC_SUPPORTED_OS}
ARCHS ${ORC_SUPPORTED_ARCH}
Expand Down Expand Up @@ -167,7 +167,7 @@ else() # not Apple
DEPS ${ORC_DEPS})

# Common ORC archive for instrumented binaries.
add_compiler_rt_runtime(clang_rt.orc
add_compiler_rt_runtime(orc_rt
${ORC_BUILD_TYPE}
ARCHS ${arch}
CFLAGS ${ORC_CFLAGS}
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/test/orc/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
orc_rt_executor_stem = os.path.join(config.compiler_rt_obj_root, 'lib/orc/tests/tools/orc-rt-executor')
lli = os.path.join(config.llvm_tools_dir, 'lli')
if config.host_os == 'Darwin':
orc_rt_path = '%s/libclang_rt.orc_osx.a' % config.compiler_rt_libdir
orc_rt_path = '%s/liborc_rt_osx.a' % config.compiler_rt_libdir
else:
orc_rt_path = '%s/libclang_rt.orc%s.a' % (config.compiler_rt_libdir, config.target_suffix)
orc_rt_path = '%s/liborc_rt%s.a' % (config.compiler_rt_libdir, config.target_suffix)

if config.libunwind_shared:
config.available_features.add('libunwind-available')
Expand Down

0 comments on commit a85e4aa

Please sign in to comment.