[compiler-rt] a85e4aa - [ORC-RT] Drop the 'clang_rt.' prefix from the ORC runtime.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Mon Sep 12 16:49:48 PDT 2022
Author: Lang Hames
Date: 2022-09-12T16:48:20-07:00
New Revision: a85e4aa37deca75b52aee27981b08c5d59c39236
URL: https://github.com/llvm/llvm-project/commit/a85e4aa37deca75b52aee27981b08c5d59c39236
DIFF: https://github.com/llvm/llvm-project/commit/a85e4aa37deca75b52aee27981b08c5d59c39236.diff
LOG: [ORC-RT] Drop the 'clang_rt.' prefix from the ORC runtime.
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.
Added:
compiler-rt/include/orc_rt/c_api.h
Modified:
compiler-rt/include/CMakeLists.txt
compiler-rt/lib/orc/CMakeLists.txt
compiler-rt/test/orc/lit.cfg.py
Removed:
compiler-rt/include/orc/c_api.h
################################################################################
diff --git a/compiler-rt/include/CMakeLists.txt b/compiler-rt/include/CMakeLists.txt
index 3151b4753f225..5968cfd0e6d2c 100644
--- a/compiler-rt/include/CMakeLists.txt
+++ b/compiler-rt/include/CMakeLists.txt
@@ -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)
diff --git a/compiler-rt/include/orc/c_api.h b/compiler-rt/include/orc_rt/c_api.h
similarity index 100%
rename from compiler-rt/include/orc/c_api.h
rename to compiler-rt/include/orc_rt/c_api.h
diff --git a/compiler-rt/lib/orc/CMakeLists.txt b/compiler-rt/lib/orc/CMakeLists.txt
index 406830a17f17a..4bb91782046b2 100644
--- a/compiler-rt/lib/orc/CMakeLists.txt
+++ b/compiler-rt/lib/orc/CMakeLists.txt
@@ -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}
@@ -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}
diff --git a/compiler-rt/test/orc/lit.cfg.py b/compiler-rt/test/orc/lit.cfg.py
index de0d899b5a570..9b409c42f005c 100644
--- a/compiler-rt/test/orc/lit.cfg.py
+++ b/compiler-rt/test/orc/lit.cfg.py
@@ -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')
More information about the llvm-commits
mailing list