[llvm] [ORC-RT] Rename the executor library to bedrock (PR #218881)
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 26 03:31:19 PDT 2026
https://github.com/lhames created https://github.com/llvm/llvm-project/pull/218881
The "executor" name was a placeholder, and clashed with "executor" as a description of the process. "bedrock" names the role: the bootstrap floor that JIT'd code is built on. A future companion library, SPIRE, will hold the JIT-loaded portion of the ORC runtime.
This is a pure rename with no functional change:
lib/executor/ -> lib/bedrock/
orc-rt-executor -> orc-rt-bedrock
orc-rt-executor-impl-headers -> orc-rt-bedrock-impl-headers
The library's public headers are also nested under an include/orc-rt/bedrock/ subdirectory, so include paths name the library the header belongs to:
#include "orc-rt/Session.h" -> #include "orc-rt/bedrock/Session.h"
The path component is organizational only: the namespace stays orc_rt, matching LLVM's convention (llvm/ADT/DenseMap.h is llvm::DenseMap). The orc-rt-headers include root is unchanged, so only the in-tree #include lines needed updating. A later change will split genuinely shared, library-neutral headers (span.h, bit.h, Error.h, the SPS serialization headers, ...) back out into a shared location.
>From b12f79ef34d8091de847800238fe2ef7bd7ad4e3 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames at gmail.com>
Date: Wed, 26 Aug 2026 16:40:29 +1000
Subject: [PATCH] [ORC-RT] Rename the executor library to bedrock
The "executor" name was a placeholder, and clashed with "executor" as a
description of the process. "bedrock" names the role: the bootstrap
floor that JIT'd code is built on. A future companion library, SPIRE,
will hold the JIT-loaded portion of the ORC runtime.
This is a pure rename with no functional change:
lib/executor/ -> lib/bedrock/
orc-rt-executor -> orc-rt-bedrock
orc-rt-executor-impl-headers -> orc-rt-bedrock-impl-headers
The library's public headers are also nested under an
include/orc-rt/bedrock/ subdirectory, so include paths name the library
the header belongs to:
#include "orc-rt/Session.h" -> #include "orc-rt/bedrock/Session.h"
The path component is organizational only: the namespace stays orc_rt,
matching LLVM's convention (llvm/ADT/DenseMap.h is llvm::DenseMap). The
orc-rt-headers include root is unchanged, so only the in-tree #include
lines needed updating. A later change will split genuinely shared,
library-neutral headers (span.h, bit.h, Error.h, the SPS serialization
headers, ...) back out into a shared location.
---
orc-rt/include/CMakeLists.txt | 86 +++++++++----------
orc-rt/include/orc-rt-utils/CommandLine.h | 4 +-
.../orc-rt/{ => bedrock}/AllocAction.h | 8 +-
.../orc-rt/{ => bedrock}/BitmaskEnum.h | 0
.../orc-rt/{ => bedrock}/BootstrapInfo.h | 8 +-
.../include/orc-rt/{ => bedrock}/CCallback.h | 0
.../{ => bedrock}/CallableTraitsHelper.h | 0
.../include/orc-rt/{ => bedrock}/Compiler.h | 0
orc-rt/include/orc-rt/{ => bedrock}/Endian.h | 0
orc-rt/include/orc-rt/{ => bedrock}/Error.h | 6 +-
.../orc-rt/{ => bedrock}/ExecutorAddress.h | 0
.../{ => bedrock}/ExecutorProcessInfo.h | 2 +-
.../{ => bedrock}/InProcessControllerAccess.h | 6 +-
.../orc-rt/{ => bedrock}/IntervalMap.h | 0
.../orc-rt/{ => bedrock}/IntervalSet.h | 0
.../orc-rt/{ => bedrock}/LockedAccess.h | 0
.../include/orc-rt/{ => bedrock}/MacroUtils.h | 0
orc-rt/include/orc-rt/{ => bedrock}/Math.h | 0
.../orc-rt/{ => bedrock}/MemoryFlags.h | 4 +-
.../orc-rt/{ => bedrock}/NativeDylibManager.h | 6 +-
orc-rt/include/orc-rt/{ => bedrock}/Proxy.h | 4 +-
.../orc-rt/{ => bedrock}/QueueingRunner.h | 2 +-
orc-rt/include/orc-rt/{ => bedrock}/RTTI.h | 0
.../orc-rt/{ => bedrock}/SPSAllocAction.h | 8 +-
.../orc-rt/{ => bedrock}/SPSMemoryFlags.h | 4 +-
.../orc-rt/{ => bedrock}/SPSWrapperFunction.h | 6 +-
.../{ => bedrock}/SPSWrapperFunctionBuffer.h | 4 +-
orc-rt/include/orc-rt/{ => bedrock}/Service.h | 4 +-
orc-rt/include/orc-rt/{ => bedrock}/Session.h | 18 ++--
.../{ => bedrock}/SimpleNativeMemoryMap.h | 16 ++--
.../{ => bedrock}/SimplePackedSerialization.h | 10 +--
.../orc-rt/{ => bedrock}/SimpleSymbolTable.h | 4 +-
.../StandaloneMachOUnwindInfoRegistrar.h | 10 +--
.../orc-rt/{ => bedrock}/StringExtras.h | 0
.../include/orc-rt/{ => bedrock}/StringPool.h | 0
.../include/orc-rt/{ => bedrock}/TaskGroup.h | 0
.../orc-rt/{ => bedrock}/ThreadPoolRunner.h | 2 +-
.../orc-rt/{ => bedrock}/WrapperFunction.h | 10 +--
orc-rt/include/orc-rt/{ => bedrock}/bind.h | 0
orc-rt/include/orc-rt/{ => bedrock}/bit.h | 0
.../orc-rt/{ => bedrock}/iterator_range.h | 0
.../orc-rt/{ => bedrock}/move_only_function.h | 2 +-
.../include/orc-rt/{ => bedrock}/scope_exit.h | 0
orc-rt/include/orc-rt/{ => bedrock}/span.h | 0
.../orc-rt/{ => bedrock}/sps-ci/AllSPSCI.h | 2 +-
.../orc-rt/{ => bedrock}/sps-ci/CallSPSCI.h | 2 +-
.../sps-ci/GDBJITRegistrarSPSCI.h | 2 +-
.../{ => bedrock}/sps-ci/MemoryAccessSPSCI.h | 2 +-
.../sps-ci/NativeDylibManagerSPSCI.h | 2 +-
.../sps-ci/SimpleNativeMemoryMapSPSCI.h | 2 +-
.../StandaloneMachOUnwindInfoRegistrarSPSCI.h | 2 +-
orc-rt/lib/CMakeLists.txt | 2 +-
.../{executor => bedrock}/BootstrapInfo.cpp | 6 +-
.../lib/{executor => bedrock}/CMakeLists.txt | 16 ++--
.../lib/{executor => bedrock}/Environment.cpp | 0
.../lib/{executor => bedrock}/Environment.h | 0
orc-rt/lib/{executor => bedrock}/Error.cpp | 2 +-
.../ExecutorProcessInfo.cpp | 6 +-
.../{executor => bedrock}/GDBJITRegistrar.cpp | 2 +-
.../{executor => bedrock}/GDBJITRegistrar.h | 4 +-
.../InProcessControllerAccess.cpp | 2 +-
orc-rt/lib/{executor => bedrock}/Logging.cpp | 0
.../{executor => bedrock}/Logging_oslog.cpp | 0
.../{executor => bedrock}/Logging_printf.cpp | 0
.../NativeDylibManager.cpp | 4 +-
orc-rt/lib/{executor => bedrock}/RTTI.cpp | 2 +-
orc-rt/lib/{executor => bedrock}/Service.cpp | 2 +-
orc-rt/lib/{executor => bedrock}/Session.cpp | 2 +-
.../SimpleNativeMemoryMap.cpp | 6 +-
.../SimpleSymbolTable.cpp | 4 +-
.../StandaloneMachOUnwindInfoRegistrar.cpp | 4 +-
.../lib/{executor => bedrock}/TargetDetails.h | 0
.../ThreadPoolRunner.cpp | 2 +-
.../Unix/NativeDylibAPIs.inc | 4 +-
.../Unix/NativeMemoryAPIs.inc | 4 +-
.../darwin/CPUFeatures.cpp | 2 +-
.../darwin/TargetTriple.cpp | 2 +-
.../windows => bedrock/linux}/CPUFeatures.cpp | 2 +-
.../linux/TargetTriple.cpp | 2 +-
.../{executor => bedrock}/sps-ci/AllSPSCI.cpp | 14 +--
.../sps-ci/CallSPSCI.cpp | 6 +-
.../sps-ci/GDBJITRegistrarSPSCI.cpp | 4 +-
.../sps-ci/MemoryAccessSPSCI.cpp | 6 +-
.../sps-ci/NativeDylibManagerSPSCI.cpp | 6 +-
.../sps-ci/SimpleNativeMemoryMapSPSCI.cpp | 10 +--
...tandaloneMachOUnwindInfoRegistrarSPSCI.cpp | 6 +-
.../linux => bedrock/windows}/CPUFeatures.cpp | 2 +-
.../windows/TargetTriple.cpp | 2 +-
orc-rt/test/CMakeLists.txt | 2 +-
orc-rt/test/tools/CMakeLists.txt | 4 +-
.../test/tools/orc-rt-process-info-check.cpp | 2 +-
orc-rt/test/unit/AllocActionTest.cpp | 2 +-
orc-rt/test/unit/AllocActionTestUtils.h | 2 +-
orc-rt/test/unit/BitmaskEnumTest.cpp | 2 +-
orc-rt/test/unit/BootstrapInfoTest.cpp | 6 +-
orc-rt/test/unit/CCallbackTest.cpp | 2 +-
orc-rt/test/unit/CMakeLists.txt | 6 +-
orc-rt/test/unit/CallSPSCITest.cpp | 4 +-
orc-rt/test/unit/CallableTraitsHelperTest.cpp | 2 +-
orc-rt/test/unit/CommandLineTest.cpp | 2 +-
orc-rt/test/unit/CommonTestUtils.h | 10 +--
orc-rt/test/unit/CompilerTest.cpp | 2 +-
orc-rt/test/unit/DirectCaller.h | 2 +-
orc-rt/test/unit/EndianTest.cpp | 4 +-
orc-rt/test/unit/ErrorCAPITest.cpp | 2 +-
.../test/unit/ErrorExceptionInteropTest.cpp | 2 +-
orc-rt/test/unit/ErrorTest.cpp | 2 +-
orc-rt/test/unit/ExecutorAddressTest.cpp | 2 +-
orc-rt/test/unit/ExecutorProcessInfoTest.cpp | 6 +-
.../unit/InProcessControllerAccessTest.cpp | 4 +-
orc-rt/test/unit/IntervalMapTest.cpp | 2 +-
orc-rt/test/unit/IntervalSetTest.cpp | 2 +-
orc-rt/test/unit/LockedAccessTest.cpp | 2 +-
orc-rt/test/unit/MacroUtilsTest.cpp | 2 +-
orc-rt/test/unit/MathTest.cpp | 2 +-
orc-rt/test/unit/MemoryAccessSPSCITest.cpp | 6 +-
orc-rt/test/unit/MemoryFlagsTest.cpp | 2 +-
.../test/unit/NativeDylibManagerSPSCITest.cpp | 8 +-
orc-rt/test/unit/NativeDylibManagerTest.cpp | 4 +-
orc-rt/test/unit/ProxyTest.cpp | 2 +-
orc-rt/test/unit/QueueingRunnerTest.cpp | 4 +-
orc-rt/test/unit/RTTITest.cpp | 2 +-
orc-rt/test/unit/SPSAllocActionTest.cpp | 4 +-
orc-rt/test/unit/SPSMemoryFlagsTest.cpp | 2 +-
.../unit/SPSWrapperFunctionBufferTest.cpp | 2 +-
orc-rt/test/unit/SPSWrapperFunctionTest.cpp | 6 +-
orc-rt/test/unit/SessionTest.cpp | 6 +-
.../unit/SimpleNativeMemoryMapSPSCITest.cpp | 12 +--
.../test/unit/SimpleNativeMemoryMapTest.cpp | 6 +-
.../unit/SimplePackedSerializationTest.cpp | 2 +-
.../unit/SimplePackedSerializationTestUtils.h | 4 +-
orc-rt/test/unit/SimpleSymbolTableTest.cpp | 2 +-
...StandaloneMachOUnwindInfoRegistrarTest.cpp | 2 +-
orc-rt/test/unit/StringExtrasTest.cpp | 2 +-
orc-rt/test/unit/StringPoolTest.cpp | 2 +-
orc-rt/test/unit/TaskGroupTest.cpp | 2 +-
orc-rt/test/unit/ThreadPoolRunnerTest.cpp | 2 +-
.../test/unit/WrapperFunctionBufferTest.cpp | 2 +-
orc-rt/test/unit/bind-test.cpp | 4 +-
orc-rt/test/unit/bit-test.cpp | 2 +-
orc-rt/test/unit/iterator_range-test.cpp | 2 +-
orc-rt/test/unit/move_only_function-test.cpp | 2 +-
orc-rt/test/unit/scope_exit-test.cpp | 2 +-
orc-rt/test/unit/span-test.cpp | 2 +-
orc-rt/tools/ogre/CMakeLists.txt | 2 +-
145 files changed, 285 insertions(+), 285 deletions(-)
rename orc-rt/include/orc-rt/{ => bedrock}/AllocAction.h (95%)
rename orc-rt/include/orc-rt/{ => bedrock}/BitmaskEnum.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/BootstrapInfo.h (93%)
rename orc-rt/include/orc-rt/{ => bedrock}/CCallback.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/CallableTraitsHelper.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/Compiler.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/Endian.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/Error.h (99%)
rename orc-rt/include/orc-rt/{ => bedrock}/ExecutorAddress.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/ExecutorProcessInfo.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/InProcessControllerAccess.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/IntervalMap.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/IntervalSet.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/LockedAccess.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/MacroUtils.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/Math.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/MemoryFlags.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/NativeDylibManager.h (96%)
rename orc-rt/include/orc-rt/{ => bedrock}/Proxy.h (97%)
rename orc-rt/include/orc-rt/{ => bedrock}/QueueingRunner.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/RTTI.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/SPSAllocAction.h (96%)
rename orc-rt/include/orc-rt/{ => bedrock}/SPSMemoryFlags.h (93%)
rename orc-rt/include/orc-rt/{ => bedrock}/SPSWrapperFunction.h (97%)
rename orc-rt/include/orc-rt/{ => bedrock}/SPSWrapperFunctionBuffer.h (93%)
rename orc-rt/include/orc-rt/{ => bedrock}/Service.h (96%)
rename orc-rt/include/orc-rt/{ => bedrock}/Session.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/SimpleNativeMemoryMap.h (93%)
rename orc-rt/include/orc-rt/{ => bedrock}/SimplePackedSerialization.h (99%)
rename orc-rt/include/orc-rt/{ => bedrock}/SimpleSymbolTable.h (97%)
rename orc-rt/include/orc-rt/{ => bedrock}/StandaloneMachOUnwindInfoRegistrar.h (95%)
rename orc-rt/include/orc-rt/{ => bedrock}/StringExtras.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/StringPool.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/TaskGroup.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/ThreadPoolRunner.h (97%)
rename orc-rt/include/orc-rt/{ => bedrock}/WrapperFunction.h (98%)
rename orc-rt/include/orc-rt/{ => bedrock}/bind.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/bit.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/iterator_range.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/move_only_function.h (99%)
rename orc-rt/include/orc-rt/{ => bedrock}/scope_exit.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/span.h (100%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/AllSPSCI.h (94%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/CallSPSCI.h (94%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/GDBJITRegistrarSPSCI.h (94%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/MemoryAccessSPSCI.h (94%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/NativeDylibManagerSPSCI.h (94%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/SimpleNativeMemoryMapSPSCI.h (95%)
rename orc-rt/include/orc-rt/{ => bedrock}/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h (95%)
rename orc-rt/lib/{executor => bedrock}/BootstrapInfo.cpp (93%)
rename orc-rt/lib/{executor => bedrock}/CMakeLists.txt (80%)
rename orc-rt/lib/{executor => bedrock}/Environment.cpp (100%)
rename orc-rt/lib/{executor => bedrock}/Environment.h (100%)
rename orc-rt/lib/{executor => bedrock}/Error.cpp (98%)
rename orc-rt/lib/{executor => bedrock}/ExecutorProcessInfo.cpp (96%)
rename orc-rt/lib/{executor => bedrock}/GDBJITRegistrar.cpp (99%)
rename orc-rt/lib/{executor => bedrock}/GDBJITRegistrar.h (96%)
rename orc-rt/lib/{executor => bedrock}/InProcessControllerAccess.cpp (99%)
rename orc-rt/lib/{executor => bedrock}/Logging.cpp (100%)
rename orc-rt/lib/{executor => bedrock}/Logging_oslog.cpp (100%)
rename orc-rt/lib/{executor => bedrock}/Logging_printf.cpp (100%)
rename orc-rt/lib/{executor => bedrock}/NativeDylibManager.cpp (97%)
rename orc-rt/lib/{executor => bedrock}/RTTI.cpp (95%)
rename orc-rt/lib/{executor => bedrock}/Service.cpp (94%)
rename orc-rt/lib/{executor => bedrock}/Session.cpp (99%)
rename orc-rt/lib/{executor => bedrock}/SimpleNativeMemoryMap.cpp (98%)
rename orc-rt/lib/{executor => bedrock}/SimpleSymbolTable.cpp (92%)
rename orc-rt/lib/{executor => bedrock}/StandaloneMachOUnwindInfoRegistrar.cpp (98%)
rename orc-rt/lib/{executor => bedrock}/TargetDetails.h (100%)
rename orc-rt/lib/{executor => bedrock}/ThreadPoolRunner.cpp (97%)
rename orc-rt/lib/{executor => bedrock}/Unix/NativeDylibAPIs.inc (96%)
rename orc-rt/lib/{executor => bedrock}/Unix/NativeMemoryAPIs.inc (97%)
rename orc-rt/lib/{executor => bedrock}/darwin/CPUFeatures.cpp (97%)
rename orc-rt/lib/{executor => bedrock}/darwin/TargetTriple.cpp (98%)
rename orc-rt/lib/{executor/windows => bedrock/linux}/CPUFeatures.cpp (74%)
rename orc-rt/lib/{executor => bedrock}/linux/TargetTriple.cpp (91%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/AllSPSCI.cpp (72%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/CallSPSCI.cpp (92%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/GDBJITRegistrarSPSCI.cpp (92%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/MemoryAccessSPSCI.cpp (97%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/NativeDylibManagerSPSCI.cpp (94%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/SimpleNativeMemoryMapSPSCI.cpp (93%)
rename orc-rt/lib/{executor => bedrock}/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp (89%)
rename orc-rt/lib/{executor/linux => bedrock/windows}/CPUFeatures.cpp (74%)
rename orc-rt/lib/{executor => bedrock}/windows/TargetTriple.cpp (91%)
diff --git a/orc-rt/include/CMakeLists.txt b/orc-rt/include/CMakeLists.txt
index 3a63f972549a2..41e66ff32c353 100644
--- a/orc-rt/include/CMakeLists.txt
+++ b/orc-rt/include/CMakeLists.txt
@@ -5,49 +5,49 @@ set(ORC_RT_HEADERS
orc-rt-c/Logging.h
orc-rt-c/WrapperFunction.h
orc-rt-c/orc-rt.h
- orc-rt/AllocAction.h
- orc-rt/BitmaskEnum.h
- orc-rt/BootstrapInfo.h
- orc-rt/CCallback.h
- orc-rt/Compiler.h
- orc-rt/Error.h
- orc-rt/ExecutorAddress.h
- orc-rt/InProcessControllerAccess.h
- orc-rt/IntervalMap.h
- orc-rt/IntervalSet.h
- orc-rt/LockedAccess.h
- orc-rt/MacroUtils.h
- orc-rt/Math.h
- orc-rt/MemoryFlags.h
- orc-rt/NativeDylibManager.h
- orc-rt/Proxy.h
- orc-rt/QueueingRunner.h
- orc-rt/RTTI.h
- orc-rt/SPSAllocAction.h
- orc-rt/SPSMemoryFlags.h
- orc-rt/SPSWrapperFunction.h
- orc-rt/SPSWrapperFunctionBuffer.h
- orc-rt/Service.h
- orc-rt/Session.h
- orc-rt/SimpleNativeMemoryMap.h
- orc-rt/SimplePackedSerialization.h
- orc-rt/SimpleSymbolTable.h
- orc-rt/StandaloneMachOUnwindInfoRegistrar.h
- orc-rt/StringPool.h
- orc-rt/TaskGroup.h
- orc-rt/ThreadPoolRunner.h
- orc-rt/WrapperFunction.h
- orc-rt/bind.h
- orc-rt/bit.h
- orc-rt/move_only_function.h
- orc-rt/scope_exit.h
- orc-rt/span.h
- orc-rt/sps-ci/AllSPSCI.h
- orc-rt/sps-ci/CallSPSCI.h
- orc-rt/sps-ci/GDBJITRegistrarSPSCI.h
- orc-rt/sps-ci/MemoryAccessSPSCI.h
- orc-rt/sps-ci/NativeDylibManagerSPSCI.h
- orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h
+ orc-rt/bedrock/AllocAction.h
+ orc-rt/bedrock/BitmaskEnum.h
+ orc-rt/bedrock/BootstrapInfo.h
+ orc-rt/bedrock/CCallback.h
+ orc-rt/bedrock/Compiler.h
+ orc-rt/bedrock/Error.h
+ orc-rt/bedrock/ExecutorAddress.h
+ orc-rt/bedrock/InProcessControllerAccess.h
+ orc-rt/bedrock/IntervalMap.h
+ orc-rt/bedrock/IntervalSet.h
+ orc-rt/bedrock/LockedAccess.h
+ orc-rt/bedrock/MacroUtils.h
+ orc-rt/bedrock/Math.h
+ orc-rt/bedrock/MemoryFlags.h
+ orc-rt/bedrock/NativeDylibManager.h
+ orc-rt/bedrock/Proxy.h
+ orc-rt/bedrock/QueueingRunner.h
+ orc-rt/bedrock/RTTI.h
+ orc-rt/bedrock/SPSAllocAction.h
+ orc-rt/bedrock/SPSMemoryFlags.h
+ orc-rt/bedrock/SPSWrapperFunction.h
+ orc-rt/bedrock/SPSWrapperFunctionBuffer.h
+ orc-rt/bedrock/Service.h
+ orc-rt/bedrock/Session.h
+ orc-rt/bedrock/SimpleNativeMemoryMap.h
+ orc-rt/bedrock/SimplePackedSerialization.h
+ orc-rt/bedrock/SimpleSymbolTable.h
+ orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h
+ orc-rt/bedrock/StringPool.h
+ orc-rt/bedrock/TaskGroup.h
+ orc-rt/bedrock/ThreadPoolRunner.h
+ orc-rt/bedrock/WrapperFunction.h
+ orc-rt/bedrock/bind.h
+ orc-rt/bedrock/bit.h
+ orc-rt/bedrock/move_only_function.h
+ orc-rt/bedrock/scope_exit.h
+ orc-rt/bedrock/span.h
+ orc-rt/bedrock/sps-ci/AllSPSCI.h
+ orc-rt/bedrock/sps-ci/CallSPSCI.h
+ orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h
+ orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h
+ orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h
+ orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h
)
# Add generated config header
diff --git a/orc-rt/include/orc-rt-utils/CommandLine.h b/orc-rt/include/orc-rt-utils/CommandLine.h
index 2bc61db529a9c..2d2c94d2fd26e 100644
--- a/orc-rt/include/orc-rt-utils/CommandLine.h
+++ b/orc-rt/include/orc-rt-utils/CommandLine.h
@@ -19,8 +19,8 @@
#include <string_view>
#include <vector>
-#include "orc-rt/Error.h"
-#include "orc-rt/StringExtras.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/StringExtras.h"
namespace orc_rt {
namespace detail {
diff --git a/orc-rt/include/orc-rt/AllocAction.h b/orc-rt/include/orc-rt/bedrock/AllocAction.h
similarity index 95%
rename from orc-rt/include/orc-rt/AllocAction.h
rename to orc-rt/include/orc-rt/bedrock/AllocAction.h
index c2afd6de1cb7b..161c527b812bd 100644
--- a/orc-rt/include/orc-rt/AllocAction.h
+++ b/orc-rt/include/orc-rt/bedrock/AllocAction.h
@@ -13,10 +13,10 @@
#ifndef ORC_RT_ALLOCACTION_H
#define ORC_RT_ALLOCACTION_H
-#include "orc-rt/CallableTraitsHelper.h"
-#include "orc-rt/Error.h"
-#include "orc-rt/WrapperFunction.h"
-#include "orc-rt/scope_exit.h"
+#include "orc-rt/bedrock/CallableTraitsHelper.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
+#include "orc-rt/bedrock/scope_exit.h"
#include <vector>
diff --git a/orc-rt/include/orc-rt/BitmaskEnum.h b/orc-rt/include/orc-rt/bedrock/BitmaskEnum.h
similarity index 100%
rename from orc-rt/include/orc-rt/BitmaskEnum.h
rename to orc-rt/include/orc-rt/bedrock/BitmaskEnum.h
diff --git a/orc-rt/include/orc-rt/BootstrapInfo.h b/orc-rt/include/orc-rt/bedrock/BootstrapInfo.h
similarity index 93%
rename from orc-rt/include/orc-rt/BootstrapInfo.h
rename to orc-rt/include/orc-rt/bedrock/BootstrapInfo.h
index ea7f0bcb3bd61..089407cdabbfa 100644
--- a/orc-rt/include/orc-rt/BootstrapInfo.h
+++ b/orc-rt/include/orc-rt/bedrock/BootstrapInfo.h
@@ -13,10 +13,10 @@
#ifndef ORC_RT_BOOTSTRAPINFO_H
#define ORC_RT_BOOTSTRAPINFO_H
-#include "orc-rt/Error.h"
-#include "orc-rt/SimpleSymbolTable.h"
-#include "orc-rt/move_only_function.h"
-#include "orc-rt/sps-ci/AllSPSCI.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/move_only_function.h"
+#include "orc-rt/bedrock/sps-ci/AllSPSCI.h"
#include <string>
#include <string_view>
#include <unordered_map>
diff --git a/orc-rt/include/orc-rt/CCallback.h b/orc-rt/include/orc-rt/bedrock/CCallback.h
similarity index 100%
rename from orc-rt/include/orc-rt/CCallback.h
rename to orc-rt/include/orc-rt/bedrock/CCallback.h
diff --git a/orc-rt/include/orc-rt/CallableTraitsHelper.h b/orc-rt/include/orc-rt/bedrock/CallableTraitsHelper.h
similarity index 100%
rename from orc-rt/include/orc-rt/CallableTraitsHelper.h
rename to orc-rt/include/orc-rt/bedrock/CallableTraitsHelper.h
diff --git a/orc-rt/include/orc-rt/Compiler.h b/orc-rt/include/orc-rt/bedrock/Compiler.h
similarity index 100%
rename from orc-rt/include/orc-rt/Compiler.h
rename to orc-rt/include/orc-rt/bedrock/Compiler.h
diff --git a/orc-rt/include/orc-rt/Endian.h b/orc-rt/include/orc-rt/bedrock/Endian.h
similarity index 100%
rename from orc-rt/include/orc-rt/Endian.h
rename to orc-rt/include/orc-rt/bedrock/Endian.h
diff --git a/orc-rt/include/orc-rt/Error.h b/orc-rt/include/orc-rt/bedrock/Error.h
similarity index 99%
rename from orc-rt/include/orc-rt/Error.h
rename to orc-rt/include/orc-rt/bedrock/Error.h
index 57c7754656f19..d213c5337784e 100644
--- a/orc-rt/include/orc-rt/Error.h
+++ b/orc-rt/include/orc-rt/bedrock/Error.h
@@ -11,9 +11,9 @@
#include "orc-rt-c/CoreTypes.h"
#include "orc-rt-c/config.h"
-#include "orc-rt/CallableTraitsHelper.h"
-#include "orc-rt/Compiler.h"
-#include "orc-rt/RTTI.h"
+#include "orc-rt/bedrock/CallableTraitsHelper.h"
+#include "orc-rt/bedrock/Compiler.h"
+#include "orc-rt/bedrock/RTTI.h"
#include <cassert>
#include <cstdint>
diff --git a/orc-rt/include/orc-rt/ExecutorAddress.h b/orc-rt/include/orc-rt/bedrock/ExecutorAddress.h
similarity index 100%
rename from orc-rt/include/orc-rt/ExecutorAddress.h
rename to orc-rt/include/orc-rt/bedrock/ExecutorAddress.h
diff --git a/orc-rt/include/orc-rt/ExecutorProcessInfo.h b/orc-rt/include/orc-rt/bedrock/ExecutorProcessInfo.h
similarity index 98%
rename from orc-rt/include/orc-rt/ExecutorProcessInfo.h
rename to orc-rt/include/orc-rt/bedrock/ExecutorProcessInfo.h
index be7c450d41eec..655f46ffd4d29 100644
--- a/orc-rt/include/orc-rt/ExecutorProcessInfo.h
+++ b/orc-rt/include/orc-rt/bedrock/ExecutorProcessInfo.h
@@ -14,7 +14,7 @@
#ifndef ORC_RT_EXECUTORPROCESSINFO_H
#define ORC_RT_EXECUTORPROCESSINFO_H
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include <initializer_list>
#include <string>
diff --git a/orc-rt/include/orc-rt/InProcessControllerAccess.h b/orc-rt/include/orc-rt/bedrock/InProcessControllerAccess.h
similarity index 98%
rename from orc-rt/include/orc-rt/InProcessControllerAccess.h
rename to orc-rt/include/orc-rt/bedrock/InProcessControllerAccess.h
index 7416c95bd74bc..60b3bbfb57e81 100644
--- a/orc-rt/include/orc-rt/InProcessControllerAccess.h
+++ b/orc-rt/include/orc-rt/bedrock/InProcessControllerAccess.h
@@ -16,9 +16,9 @@
#include "orc-rt-c/CoreTypes.h"
#include "orc-rt-c/WrapperFunction.h"
-#include "orc-rt/Error.h"
-#include "orc-rt/Session.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <mutex>
#include <unordered_map>
diff --git a/orc-rt/include/orc-rt/IntervalMap.h b/orc-rt/include/orc-rt/bedrock/IntervalMap.h
similarity index 100%
rename from orc-rt/include/orc-rt/IntervalMap.h
rename to orc-rt/include/orc-rt/bedrock/IntervalMap.h
diff --git a/orc-rt/include/orc-rt/IntervalSet.h b/orc-rt/include/orc-rt/bedrock/IntervalSet.h
similarity index 100%
rename from orc-rt/include/orc-rt/IntervalSet.h
rename to orc-rt/include/orc-rt/bedrock/IntervalSet.h
diff --git a/orc-rt/include/orc-rt/LockedAccess.h b/orc-rt/include/orc-rt/bedrock/LockedAccess.h
similarity index 100%
rename from orc-rt/include/orc-rt/LockedAccess.h
rename to orc-rt/include/orc-rt/bedrock/LockedAccess.h
diff --git a/orc-rt/include/orc-rt/MacroUtils.h b/orc-rt/include/orc-rt/bedrock/MacroUtils.h
similarity index 100%
rename from orc-rt/include/orc-rt/MacroUtils.h
rename to orc-rt/include/orc-rt/bedrock/MacroUtils.h
diff --git a/orc-rt/include/orc-rt/Math.h b/orc-rt/include/orc-rt/bedrock/Math.h
similarity index 100%
rename from orc-rt/include/orc-rt/Math.h
rename to orc-rt/include/orc-rt/bedrock/Math.h
diff --git a/orc-rt/include/orc-rt/MemoryFlags.h b/orc-rt/include/orc-rt/bedrock/MemoryFlags.h
similarity index 98%
rename from orc-rt/include/orc-rt/MemoryFlags.h
rename to orc-rt/include/orc-rt/bedrock/MemoryFlags.h
index 128fbfc6c3bfd..9b9586a0fdebf 100644
--- a/orc-rt/include/orc-rt/MemoryFlags.h
+++ b/orc-rt/include/orc-rt/bedrock/MemoryFlags.h
@@ -13,8 +13,8 @@
#ifndef ORC_RT_MEMORYFLAGS_H
#define ORC_RT_MEMORYFLAGS_H
-#include "orc-rt/BitmaskEnum.h"
-#include "orc-rt/bit.h"
+#include "orc-rt/bedrock/BitmaskEnum.h"
+#include "orc-rt/bedrock/bit.h"
#include <algorithm>
#include <utility>
diff --git a/orc-rt/include/orc-rt/NativeDylibManager.h b/orc-rt/include/orc-rt/bedrock/NativeDylibManager.h
similarity index 96%
rename from orc-rt/include/orc-rt/NativeDylibManager.h
rename to orc-rt/include/orc-rt/bedrock/NativeDylibManager.h
index 2a8f54c29b149..0d35109ddf4bf 100644
--- a/orc-rt/include/orc-rt/NativeDylibManager.h
+++ b/orc-rt/include/orc-rt/bedrock/NativeDylibManager.h
@@ -13,9 +13,9 @@
#ifndef ORC_RT_NATIVEDYLIBMANAGER_H
#define ORC_RT_NATIVEDYLIBMANAGER_H
-#include "orc-rt/BootstrapInfo.h"
-#include "orc-rt/Service.h"
-#include "orc-rt/sps-ci/NativeDylibManagerSPSCI.h"
+#include "orc-rt/bedrock/BootstrapInfo.h"
+#include "orc-rt/bedrock/Service.h"
+#include "orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h"
#include <optional>
diff --git a/orc-rt/include/orc-rt/Proxy.h b/orc-rt/include/orc-rt/bedrock/Proxy.h
similarity index 97%
rename from orc-rt/include/orc-rt/Proxy.h
rename to orc-rt/include/orc-rt/bedrock/Proxy.h
index 2b4b8dde0de2c..6ef922e9960ed 100644
--- a/orc-rt/include/orc-rt/Proxy.h
+++ b/orc-rt/include/orc-rt/bedrock/Proxy.h
@@ -22,8 +22,8 @@
#ifndef ORC_RT_PROXY_H
#define ORC_RT_PROXY_H
-#include "orc-rt/Error.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <cassert>
#include <utility>
diff --git a/orc-rt/include/orc-rt/QueueingRunner.h b/orc-rt/include/orc-rt/bedrock/QueueingRunner.h
similarity index 98%
rename from orc-rt/include/orc-rt/QueueingRunner.h
rename to orc-rt/include/orc-rt/bedrock/QueueingRunner.h
index 0e9941a783f87..ec45f93799dcf 100644
--- a/orc-rt/include/orc-rt/QueueingRunner.h
+++ b/orc-rt/include/orc-rt/bedrock/QueueingRunner.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_QUEUEINGRUNNER_H
#define ORC_RT_QUEUEINGRUNNER_H
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <deque>
#include <mutex>
diff --git a/orc-rt/include/orc-rt/RTTI.h b/orc-rt/include/orc-rt/bedrock/RTTI.h
similarity index 100%
rename from orc-rt/include/orc-rt/RTTI.h
rename to orc-rt/include/orc-rt/bedrock/RTTI.h
diff --git a/orc-rt/include/orc-rt/SPSAllocAction.h b/orc-rt/include/orc-rt/bedrock/SPSAllocAction.h
similarity index 96%
rename from orc-rt/include/orc-rt/SPSAllocAction.h
rename to orc-rt/include/orc-rt/bedrock/SPSAllocAction.h
index 460a26ee11e77..b972d433a8e74 100644
--- a/orc-rt/include/orc-rt/SPSAllocAction.h
+++ b/orc-rt/include/orc-rt/bedrock/SPSAllocAction.h
@@ -14,10 +14,10 @@
#ifndef ORC_RT_SPSALLOCACTION_H
#define ORC_RT_SPSALLOCACTION_H
-#include "orc-rt/AllocAction.h"
-#include "orc-rt/MacroUtils.h"
-#include "orc-rt/SPSWrapperFunctionBuffer.h"
-#include "orc-rt/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/AllocAction.h"
+#include "orc-rt/bedrock/MacroUtils.h"
+#include "orc-rt/bedrock/SPSWrapperFunctionBuffer.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
/// Define an allocation-action wrapper function with the given Name that
/// uses SPS to deserialize its arguments and dispatches to Handle.
diff --git a/orc-rt/include/orc-rt/SPSMemoryFlags.h b/orc-rt/include/orc-rt/bedrock/SPSMemoryFlags.h
similarity index 93%
rename from orc-rt/include/orc-rt/SPSMemoryFlags.h
rename to orc-rt/include/orc-rt/bedrock/SPSMemoryFlags.h
index 133875bb0d838..4601bef826f1f 100644
--- a/orc-rt/include/orc-rt/SPSMemoryFlags.h
+++ b/orc-rt/include/orc-rt/bedrock/SPSMemoryFlags.h
@@ -13,8 +13,8 @@
#ifndef ORC_RT_SPSMEMORYFLAGS_H
#define ORC_RT_SPSMEMORYFLAGS_H
-#include "orc-rt/MemoryFlags.h"
-#include "orc-rt/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/MemoryFlags.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
namespace orc_rt {
diff --git a/orc-rt/include/orc-rt/SPSWrapperFunction.h b/orc-rt/include/orc-rt/bedrock/SPSWrapperFunction.h
similarity index 97%
rename from orc-rt/include/orc-rt/SPSWrapperFunction.h
rename to orc-rt/include/orc-rt/bedrock/SPSWrapperFunction.h
index 777c32527a574..503b381798457 100644
--- a/orc-rt/include/orc-rt/SPSWrapperFunction.h
+++ b/orc-rt/include/orc-rt/bedrock/SPSWrapperFunction.h
@@ -14,9 +14,9 @@
#ifndef ORC_RT_SPSWRAPPERFUNCTION_H
#define ORC_RT_SPSWRAPPERFUNCTION_H
-#include "orc-rt/Compiler.h"
-#include "orc-rt/SimplePackedSerialization.h"
-#include "orc-rt/WrapperFunction.h"
+#include "orc-rt/bedrock/Compiler.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
#define ORC_RT_SPS_WRAPPER(Name, SPSSig, Handle) \
static void Name(orc_rt_SessionRef S, orc_rt_WrapperFunctionBuffer ArgBytes, \
diff --git a/orc-rt/include/orc-rt/SPSWrapperFunctionBuffer.h b/orc-rt/include/orc-rt/bedrock/SPSWrapperFunctionBuffer.h
similarity index 93%
rename from orc-rt/include/orc-rt/SPSWrapperFunctionBuffer.h
rename to orc-rt/include/orc-rt/bedrock/SPSWrapperFunctionBuffer.h
index 5799c386fee47..aaa5c01ab4b50 100644
--- a/orc-rt/include/orc-rt/SPSWrapperFunctionBuffer.h
+++ b/orc-rt/include/orc-rt/bedrock/SPSWrapperFunctionBuffer.h
@@ -13,8 +13,8 @@
#ifndef ORC_RT_SPSWRAPPERFUNCTIONBUFFER_H
#define ORC_RT_SPSWRAPPERFUNCTIONBUFFER_H
-#include "orc-rt/SimplePackedSerialization.h"
-#include "orc-rt/WrapperFunction.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
namespace orc_rt {
diff --git a/orc-rt/include/orc-rt/Service.h b/orc-rt/include/orc-rt/bedrock/Service.h
similarity index 96%
rename from orc-rt/include/orc-rt/Service.h
rename to orc-rt/include/orc-rt/bedrock/Service.h
index 3d2a73625290a..47fca2ff0d1b7 100644
--- a/orc-rt/include/orc-rt/Service.h
+++ b/orc-rt/include/orc-rt/bedrock/Service.h
@@ -13,8 +13,8 @@
#ifndef ORC_RT_SERVICE_H
#define ORC_RT_SERVICE_H
-#include "orc-rt/Error.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/move_only_function.h"
namespace orc_rt {
diff --git a/orc-rt/include/orc-rt/Session.h b/orc-rt/include/orc-rt/bedrock/Session.h
similarity index 98%
rename from orc-rt/include/orc-rt/Session.h
rename to orc-rt/include/orc-rt/bedrock/Session.h
index 43ffcf8775a34..57bde933f3b02 100644
--- a/orc-rt/include/orc-rt/Session.h
+++ b/orc-rt/include/orc-rt/bedrock/Session.h
@@ -13,15 +13,15 @@
#ifndef ORC_RT_SESSION_H
#define ORC_RT_SESSION_H
-#include "orc-rt/BootstrapInfo.h"
-#include "orc-rt/Error.h"
-#include "orc-rt/ExecutorProcessInfo.h"
-#include "orc-rt/LockedAccess.h"
-#include "orc-rt/Service.h"
-#include "orc-rt/SimpleSymbolTable.h"
-#include "orc-rt/TaskGroup.h"
-#include "orc-rt/WrapperFunction.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/BootstrapInfo.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/LockedAccess.h"
+#include "orc-rt/bedrock/Service.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/TaskGroup.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "orc-rt-c/CoreTypes.h"
#include "orc-rt-c/WrapperFunction.h"
diff --git a/orc-rt/include/orc-rt/SimpleNativeMemoryMap.h b/orc-rt/include/orc-rt/bedrock/SimpleNativeMemoryMap.h
similarity index 93%
rename from orc-rt/include/orc-rt/SimpleNativeMemoryMap.h
rename to orc-rt/include/orc-rt/bedrock/SimpleNativeMemoryMap.h
index a6715c2639467..ed43c30fa95ea 100644
--- a/orc-rt/include/orc-rt/SimpleNativeMemoryMap.h
+++ b/orc-rt/include/orc-rt/bedrock/SimpleNativeMemoryMap.h
@@ -13,14 +13,14 @@
#ifndef ORC_RT_SIMPLENATIVEMEMORYMAP_H
#define ORC_RT_SIMPLENATIVEMEMORYMAP_H
-#include "orc-rt/AllocAction.h"
-#include "orc-rt/BootstrapInfo.h"
-#include "orc-rt/Error.h"
-#include "orc-rt/MemoryFlags.h"
-#include "orc-rt/Service.h"
-#include "orc-rt/SimpleSymbolTable.h"
-#include "orc-rt/move_only_function.h"
-#include "orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h"
+#include "orc-rt/bedrock/AllocAction.h"
+#include "orc-rt/bedrock/BootstrapInfo.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/MemoryFlags.h"
+#include "orc-rt/bedrock/Service.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/move_only_function.h"
+#include "orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h"
#include <map>
#include <mutex>
diff --git a/orc-rt/include/orc-rt/SimplePackedSerialization.h b/orc-rt/include/orc-rt/bedrock/SimplePackedSerialization.h
similarity index 99%
rename from orc-rt/include/orc-rt/SimplePackedSerialization.h
rename to orc-rt/include/orc-rt/bedrock/SimplePackedSerialization.h
index f3cab4ade13c3..58181a5a51c35 100644
--- a/orc-rt/include/orc-rt/SimplePackedSerialization.h
+++ b/orc-rt/include/orc-rt/bedrock/SimplePackedSerialization.h
@@ -34,11 +34,11 @@
#ifndef ORC_RT_SIMPLEPACKEDSERIALIZATION_H
#define ORC_RT_SIMPLEPACKEDSERIALIZATION_H
-#include "orc-rt/Error.h"
-#include "orc-rt/ExecutorAddress.h"
-#include "orc-rt/bit.h"
-#include "orc-rt/iterator_range.h"
-#include "orc-rt/span.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/ExecutorAddress.h"
+#include "orc-rt/bedrock/bit.h"
+#include "orc-rt/bedrock/iterator_range.h"
+#include "orc-rt/bedrock/span.h"
#include <cstring>
#include <limits>
diff --git a/orc-rt/include/orc-rt/SimpleSymbolTable.h b/orc-rt/include/orc-rt/bedrock/SimpleSymbolTable.h
similarity index 97%
rename from orc-rt/include/orc-rt/SimpleSymbolTable.h
rename to orc-rt/include/orc-rt/bedrock/SimpleSymbolTable.h
index c37452282e751..67ffd9734e013 100644
--- a/orc-rt/include/orc-rt/SimpleSymbolTable.h
+++ b/orc-rt/include/orc-rt/bedrock/SimpleSymbolTable.h
@@ -13,8 +13,8 @@
#ifndef ORC_RT_SIMPLESYMBOLTABLE_H
#define ORC_RT_SIMPLESYMBOLTABLE_H
-#include "orc-rt/Error.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <string>
#include <string_view>
#include <unordered_map>
diff --git a/orc-rt/include/orc-rt/StandaloneMachOUnwindInfoRegistrar.h b/orc-rt/include/orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h
similarity index 95%
rename from orc-rt/include/orc-rt/StandaloneMachOUnwindInfoRegistrar.h
rename to orc-rt/include/orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h
index bc7a58f96a701..9254653d88c5b 100644
--- a/orc-rt/include/orc-rt/StandaloneMachOUnwindInfoRegistrar.h
+++ b/orc-rt/include/orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h
@@ -17,11 +17,11 @@
#ifndef ORC_RT_STANDALONEMACHOUNWINDINFOREGISTRAR_H
#define ORC_RT_STANDALONEMACHOUNWINDINFOREGISTRAR_H
-#include "orc-rt/Error.h"
-#include "orc-rt/ExecutorAddress.h"
-#include "orc-rt/SimpleSymbolTable.h"
-#include "orc-rt/move_only_function.h"
-#include "orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/ExecutorAddress.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/move_only_function.h"
+#include "orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
#include <cstdint>
#include <map>
diff --git a/orc-rt/include/orc-rt/StringExtras.h b/orc-rt/include/orc-rt/bedrock/StringExtras.h
similarity index 100%
rename from orc-rt/include/orc-rt/StringExtras.h
rename to orc-rt/include/orc-rt/bedrock/StringExtras.h
diff --git a/orc-rt/include/orc-rt/StringPool.h b/orc-rt/include/orc-rt/bedrock/StringPool.h
similarity index 100%
rename from orc-rt/include/orc-rt/StringPool.h
rename to orc-rt/include/orc-rt/bedrock/StringPool.h
diff --git a/orc-rt/include/orc-rt/TaskGroup.h b/orc-rt/include/orc-rt/bedrock/TaskGroup.h
similarity index 100%
rename from orc-rt/include/orc-rt/TaskGroup.h
rename to orc-rt/include/orc-rt/bedrock/TaskGroup.h
diff --git a/orc-rt/include/orc-rt/ThreadPoolRunner.h b/orc-rt/include/orc-rt/bedrock/ThreadPoolRunner.h
similarity index 97%
rename from orc-rt/include/orc-rt/ThreadPoolRunner.h
rename to orc-rt/include/orc-rt/bedrock/ThreadPoolRunner.h
index 2f18826b0eac1..8ab4e444e79a3 100644
--- a/orc-rt/include/orc-rt/ThreadPoolRunner.h
+++ b/orc-rt/include/orc-rt/bedrock/ThreadPoolRunner.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_THREADPOOLRUNNER_H
#define ORC_RT_THREADPOOLRUNNER_H
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <condition_variable>
#include <cstddef>
diff --git a/orc-rt/include/orc-rt/WrapperFunction.h b/orc-rt/include/orc-rt/bedrock/WrapperFunction.h
similarity index 98%
rename from orc-rt/include/orc-rt/WrapperFunction.h
rename to orc-rt/include/orc-rt/bedrock/WrapperFunction.h
index 652288a495a4f..f8085244c277e 100644
--- a/orc-rt/include/orc-rt/WrapperFunction.h
+++ b/orc-rt/include/orc-rt/bedrock/WrapperFunction.h
@@ -14,11 +14,11 @@
#define ORC_RT_WRAPPERFUNCTION_H
#include "orc-rt-c/WrapperFunction.h"
-#include "orc-rt/CallableTraitsHelper.h"
-#include "orc-rt/Error.h"
-#include "orc-rt/ExecutorAddress.h"
-#include "orc-rt/bind.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/CallableTraitsHelper.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/ExecutorAddress.h"
+#include "orc-rt/bedrock/bind.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <utility>
diff --git a/orc-rt/include/orc-rt/bind.h b/orc-rt/include/orc-rt/bedrock/bind.h
similarity index 100%
rename from orc-rt/include/orc-rt/bind.h
rename to orc-rt/include/orc-rt/bedrock/bind.h
diff --git a/orc-rt/include/orc-rt/bit.h b/orc-rt/include/orc-rt/bedrock/bit.h
similarity index 100%
rename from orc-rt/include/orc-rt/bit.h
rename to orc-rt/include/orc-rt/bedrock/bit.h
diff --git a/orc-rt/include/orc-rt/iterator_range.h b/orc-rt/include/orc-rt/bedrock/iterator_range.h
similarity index 100%
rename from orc-rt/include/orc-rt/iterator_range.h
rename to orc-rt/include/orc-rt/bedrock/iterator_range.h
diff --git a/orc-rt/include/orc-rt/move_only_function.h b/orc-rt/include/orc-rt/bedrock/move_only_function.h
similarity index 99%
rename from orc-rt/include/orc-rt/move_only_function.h
rename to orc-rt/include/orc-rt/bedrock/move_only_function.h
index 017737abe8385..e00735afa6c99 100644
--- a/orc-rt/include/orc-rt/move_only_function.h
+++ b/orc-rt/include/orc-rt/bedrock/move_only_function.h
@@ -27,7 +27,7 @@
#ifndef ORC_RT_MOVE_ONLY_FUNCTION_H
#define ORC_RT_MOVE_ONLY_FUNCTION_H
-#include "orc-rt/CallableTraitsHelper.h"
+#include "orc-rt/bedrock/CallableTraitsHelper.h"
#include <memory>
#include <type_traits>
diff --git a/orc-rt/include/orc-rt/scope_exit.h b/orc-rt/include/orc-rt/bedrock/scope_exit.h
similarity index 100%
rename from orc-rt/include/orc-rt/scope_exit.h
rename to orc-rt/include/orc-rt/bedrock/scope_exit.h
diff --git a/orc-rt/include/orc-rt/span.h b/orc-rt/include/orc-rt/bedrock/span.h
similarity index 100%
rename from orc-rt/include/orc-rt/span.h
rename to orc-rt/include/orc-rt/bedrock/span.h
diff --git a/orc-rt/include/orc-rt/sps-ci/AllSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/AllSPSCI.h
similarity index 94%
rename from orc-rt/include/orc-rt/sps-ci/AllSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/AllSPSCI.h
index 07356448b0670..ddbfd0fe8a725 100644
--- a/orc-rt/include/orc-rt/sps-ci/AllSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/AllSPSCI.h
@@ -14,7 +14,7 @@
#ifndef ORC_RT_SPS_CI_ALLSPSCI_H
#define ORC_RT_SPS_CI_ALLSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/CallSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/CallSPSCI.h
similarity index 94%
rename from orc-rt/include/orc-rt/sps-ci/CallSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/CallSPSCI.h
index 550c7676f003a..e2d1241962d1c 100644
--- a/orc-rt/include/orc-rt/sps-ci/CallSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/CallSPSCI.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_SPS_CI_CALLSPSCI_H
#define ORC_RT_SPS_CI_CALLSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/GDBJITRegistrarSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h
similarity index 94%
rename from orc-rt/include/orc-rt/sps-ci/GDBJITRegistrarSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h
index 747e46a6a97d3..6248f181e450b 100644
--- a/orc-rt/include/orc-rt/sps-ci/GDBJITRegistrarSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_SPS_CI_GDBJITREGISTRARSPSCI_H
#define ORC_RT_SPS_CI_GDBJITREGISTRARSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/MemoryAccessSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h
similarity index 94%
rename from orc-rt/include/orc-rt/sps-ci/MemoryAccessSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h
index 59229738294c5..28d9240dd970c 100644
--- a/orc-rt/include/orc-rt/sps-ci/MemoryAccessSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_SPS_CI_MEMORYACCESSSPSCI_H
#define ORC_RT_SPS_CI_MEMORYACCESSSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/NativeDylibManagerSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h
similarity index 94%
rename from orc-rt/include/orc-rt/sps-ci/NativeDylibManagerSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h
index 73f49d2b66095..b74ddae3892d7 100644
--- a/orc-rt/include/orc-rt/sps-ci/NativeDylibManagerSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_SPS_CI_NATIVEDYLIBMANAGERSPSCI_H
#define ORC_RT_SPS_CI_NATIVEDYLIBMANAGERSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h
similarity index 95%
rename from orc-rt/include/orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h
index 17086f7045490..00fe97b8f3b55 100644
--- a/orc-rt/include/orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h
@@ -13,7 +13,7 @@
#ifndef ORC_RT_SPS_CI_SIMPLENATIVEMEMORYMAPSPSCI_H
#define ORC_RT_SPS_CI_SIMPLENATIVEMEMORYMAPSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/include/orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h b/orc-rt/include/orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h
similarity index 95%
rename from orc-rt/include/orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h
rename to orc-rt/include/orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h
index f3059f3d17e0c..4b4800f9043f3 100644
--- a/orc-rt/include/orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h
+++ b/orc-rt/include/orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h
@@ -14,7 +14,7 @@
#ifndef ORC_RT_SPS_CI_STANDALONEMACHOUNWINDINFOREGISTRARSPSCI_H
#define ORC_RT_SPS_CI_STANDALONEMACHOUNWINDINFOREGISTRARSPSCI_H
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/lib/CMakeLists.txt b/orc-rt/lib/CMakeLists.txt
index 993f2b8b52eb7..a8feba7209994 100644
--- a/orc-rt/lib/CMakeLists.txt
+++ b/orc-rt/lib/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(executor)
+add_subdirectory(bedrock)
diff --git a/orc-rt/lib/executor/BootstrapInfo.cpp b/orc-rt/lib/bedrock/BootstrapInfo.cpp
similarity index 93%
rename from orc-rt/lib/executor/BootstrapInfo.cpp
rename to orc-rt/lib/bedrock/BootstrapInfo.cpp
index 5e80e43eee026..cbb2eb475b771 100644
--- a/orc-rt/lib/executor/BootstrapInfo.cpp
+++ b/orc-rt/lib/bedrock/BootstrapInfo.cpp
@@ -10,10 +10,10 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/BootstrapInfo.h"
+#include "orc-rt/bedrock/BootstrapInfo.h"
-#include "orc-rt/ExecutorProcessInfo.h"
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/Session.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/CMakeLists.txt b/orc-rt/lib/bedrock/CMakeLists.txt
similarity index 80%
rename from orc-rt/lib/executor/CMakeLists.txt
rename to orc-rt/lib/bedrock/CMakeLists.txt
index b5c49c989a2e4..abc67f10634b1 100644
--- a/orc-rt/lib/executor/CMakeLists.txt
+++ b/orc-rt/lib/bedrock/CMakeLists.txt
@@ -57,24 +57,24 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
else()
message(WARNING
"orc-rt: no platform implementation for ${CMAKE_SYSTEM_NAME}; "
- "Add an orc-rt/lib/executor/<platform>/ directory")
+ "Add an orc-rt/lib/bedrock/<platform>/ directory")
endif()
-add_library(orc-rt-executor STATIC ${ORC_RT_SOURCES})
+add_library(orc-rt-bedrock STATIC ${ORC_RT_SOURCES})
-target_link_libraries(orc-rt-executor PUBLIC orc-rt-headers)
+target_link_libraries(orc-rt-bedrock PUBLIC orc-rt-headers)
-add_library(orc-rt-executor-impl-headers INTERFACE)
-# Add it via lib so that to include impl details its "executor/"
+add_library(orc-rt-bedrock-impl-headers INTERFACE)
+# Add it via lib so that to include impl details its "bedrock/"
# to prevent collisions down the line
-target_include_directories(orc-rt-executor-impl-headers INTERFACE
+target_include_directories(orc-rt-bedrock-impl-headers INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>
)
# Apply RTTI and exceptions compile flags
-target_compile_options(orc-rt-executor PRIVATE ${ORC_RT_COMPILE_FLAGS})
+target_compile_options(orc-rt-bedrock PRIVATE ${ORC_RT_COMPILE_FLAGS})
# TODO: Use common runtimes infrastructure for output and install paths
-install(TARGETS orc-rt-executor
+install(TARGETS orc-rt-bedrock
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT OrcRT_Development
PUBLIC_HEADER DESTINATION include COMPONENT OrcRT_Development
diff --git a/orc-rt/lib/executor/Environment.cpp b/orc-rt/lib/bedrock/Environment.cpp
similarity index 100%
rename from orc-rt/lib/executor/Environment.cpp
rename to orc-rt/lib/bedrock/Environment.cpp
diff --git a/orc-rt/lib/executor/Environment.h b/orc-rt/lib/bedrock/Environment.h
similarity index 100%
rename from orc-rt/lib/executor/Environment.h
rename to orc-rt/lib/bedrock/Environment.h
diff --git a/orc-rt/lib/executor/Error.cpp b/orc-rt/lib/bedrock/Error.cpp
similarity index 98%
rename from orc-rt/lib/executor/Error.cpp
rename to orc-rt/lib/bedrock/Error.cpp
index 759708aae145a..66148182d8443 100644
--- a/orc-rt/lib/executor/Error.cpp
+++ b/orc-rt/lib/bedrock/Error.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include "orc-rt-c/Error.h"
#include <cstring>
diff --git a/orc-rt/lib/executor/ExecutorProcessInfo.cpp b/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
similarity index 96%
rename from orc-rt/lib/executor/ExecutorProcessInfo.cpp
rename to orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
index c247f7f097220..353e6e5632084 100644
--- a/orc-rt/lib/executor/ExecutorProcessInfo.cpp
+++ b/orc-rt/lib/bedrock/ExecutorProcessInfo.cpp
@@ -11,9 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorProcessInfo.h"
-#include "orc-rt/Math.h"
-#include "orc-rt/StringExtras.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/Math.h"
+#include "orc-rt/bedrock/StringExtras.h"
#include <cassert>
#include <cstring>
diff --git a/orc-rt/lib/executor/GDBJITRegistrar.cpp b/orc-rt/lib/bedrock/GDBJITRegistrar.cpp
similarity index 99%
rename from orc-rt/lib/executor/GDBJITRegistrar.cpp
rename to orc-rt/lib/bedrock/GDBJITRegistrar.cpp
index badf099a3503f..1c4dfc46535d6 100644
--- a/orc-rt/lib/executor/GDBJITRegistrar.cpp
+++ b/orc-rt/lib/bedrock/GDBJITRegistrar.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "GDBJITRegistrar.h"
-#include "orc-rt/Compiler.h"
+#include "orc-rt/bedrock/Compiler.h"
#include <cstdint>
#include <mutex>
diff --git a/orc-rt/lib/executor/GDBJITRegistrar.h b/orc-rt/lib/bedrock/GDBJITRegistrar.h
similarity index 96%
rename from orc-rt/lib/executor/GDBJITRegistrar.h
rename to orc-rt/lib/bedrock/GDBJITRegistrar.h
index 00a802e27c0cc..144ce6d72a9cf 100644
--- a/orc-rt/lib/executor/GDBJITRegistrar.h
+++ b/orc-rt/lib/bedrock/GDBJITRegistrar.h
@@ -21,8 +21,8 @@
#ifndef ORC_RT_GDBJITREGISTRAR_H
#define ORC_RT_GDBJITREGISTRAR_H
-#include "orc-rt/Error.h"
-#include "orc-rt/span.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/span.h"
namespace orc_rt::gdb_jit {
diff --git a/orc-rt/lib/executor/InProcessControllerAccess.cpp b/orc-rt/lib/bedrock/InProcessControllerAccess.cpp
similarity index 99%
rename from orc-rt/lib/executor/InProcessControllerAccess.cpp
rename to orc-rt/lib/bedrock/InProcessControllerAccess.cpp
index 616c8a78c8625..68d7abfe561d3 100644
--- a/orc-rt/lib/executor/InProcessControllerAccess.cpp
+++ b/orc-rt/lib/bedrock/InProcessControllerAccess.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/InProcessControllerAccess.h"
+#include "orc-rt/bedrock/InProcessControllerAccess.h"
#include <cassert>
diff --git a/orc-rt/lib/executor/Logging.cpp b/orc-rt/lib/bedrock/Logging.cpp
similarity index 100%
rename from orc-rt/lib/executor/Logging.cpp
rename to orc-rt/lib/bedrock/Logging.cpp
diff --git a/orc-rt/lib/executor/Logging_oslog.cpp b/orc-rt/lib/bedrock/Logging_oslog.cpp
similarity index 100%
rename from orc-rt/lib/executor/Logging_oslog.cpp
rename to orc-rt/lib/bedrock/Logging_oslog.cpp
diff --git a/orc-rt/lib/executor/Logging_printf.cpp b/orc-rt/lib/bedrock/Logging_printf.cpp
similarity index 100%
rename from orc-rt/lib/executor/Logging_printf.cpp
rename to orc-rt/lib/bedrock/Logging_printf.cpp
diff --git a/orc-rt/lib/executor/NativeDylibManager.cpp b/orc-rt/lib/bedrock/NativeDylibManager.cpp
similarity index 97%
rename from orc-rt/lib/executor/NativeDylibManager.cpp
rename to orc-rt/lib/bedrock/NativeDylibManager.cpp
index fc9c3374ad64d..fd49413f2eb8d 100644
--- a/orc-rt/lib/executor/NativeDylibManager.cpp
+++ b/orc-rt/lib/bedrock/NativeDylibManager.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/NativeDylibManager.h"
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/NativeDylibManager.h"
+#include "orc-rt/bedrock/Session.h"
#if defined(__APPLE__) || defined(__linux__)
#include "Unix/NativeDylibAPIs.inc"
diff --git a/orc-rt/lib/executor/RTTI.cpp b/orc-rt/lib/bedrock/RTTI.cpp
similarity index 95%
rename from orc-rt/lib/executor/RTTI.cpp
rename to orc-rt/lib/bedrock/RTTI.cpp
index 0cf716c1090fe..331ea67fc94d0 100644
--- a/orc-rt/lib/executor/RTTI.cpp
+++ b/orc-rt/lib/bedrock/RTTI.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/RTTI.h"
+#include "orc-rt/bedrock/RTTI.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/Service.cpp b/orc-rt/lib/bedrock/Service.cpp
similarity index 94%
rename from orc-rt/lib/executor/Service.cpp
rename to orc-rt/lib/bedrock/Service.cpp
index e4b75da416554..71b3d4db3774d 100644
--- a/orc-rt/lib/executor/Service.cpp
+++ b/orc-rt/lib/bedrock/Service.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Service.h"
+#include "orc-rt/bedrock/Service.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/Session.cpp b/orc-rt/lib/bedrock/Session.cpp
similarity index 99%
rename from orc-rt/lib/executor/Session.cpp
rename to orc-rt/lib/bedrock/Session.cpp
index 820b5117c17c4..e51c01342d85f 100644
--- a/orc-rt/lib/executor/Session.cpp
+++ b/orc-rt/lib/bedrock/Session.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/Session.h"
#include "orc-rt-c/Logging.h"
#include "orc-rt-c/Session.h"
diff --git a/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp b/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
similarity index 98%
rename from orc-rt/lib/executor/SimpleNativeMemoryMap.cpp
rename to orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
index 4919afd8ad081..1bb398a990402 100644
--- a/orc-rt/lib/executor/SimpleNativeMemoryMap.cpp
+++ b/orc-rt/lib/bedrock/SimpleNativeMemoryMap.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SimpleNativeMemoryMap.h"
-#include "orc-rt/Session.h"
-#include "orc-rt/StringExtras.h"
+#include "orc-rt/bedrock/SimpleNativeMemoryMap.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/StringExtras.h"
#include <optional>
diff --git a/orc-rt/lib/executor/SimpleSymbolTable.cpp b/orc-rt/lib/bedrock/SimpleSymbolTable.cpp
similarity index 92%
rename from orc-rt/lib/executor/SimpleSymbolTable.cpp
rename to orc-rt/lib/bedrock/SimpleSymbolTable.cpp
index 2bb9e85328359..0245ce6bc7a64 100644
--- a/orc-rt/lib/executor/SimpleSymbolTable.cpp
+++ b/orc-rt/lib/bedrock/SimpleSymbolTable.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SimpleSymbolTable.h"
-#include "orc-rt/iterator_range.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/iterator_range.h"
#include <algorithm>
diff --git a/orc-rt/lib/executor/StandaloneMachOUnwindInfoRegistrar.cpp b/orc-rt/lib/bedrock/StandaloneMachOUnwindInfoRegistrar.cpp
similarity index 98%
rename from orc-rt/lib/executor/StandaloneMachOUnwindInfoRegistrar.cpp
rename to orc-rt/lib/bedrock/StandaloneMachOUnwindInfoRegistrar.cpp
index 87491b956ba3b..24e8217cf1d67 100644
--- a/orc-rt/lib/executor/StandaloneMachOUnwindInfoRegistrar.cpp
+++ b/orc-rt/lib/bedrock/StandaloneMachOUnwindInfoRegistrar.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/StandaloneMachOUnwindInfoRegistrar.h"
-#include "orc-rt/Compiler.h"
+#include "orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h"
+#include "orc-rt/bedrock/Compiler.h"
#include <mutex>
diff --git a/orc-rt/lib/executor/TargetDetails.h b/orc-rt/lib/bedrock/TargetDetails.h
similarity index 100%
rename from orc-rt/lib/executor/TargetDetails.h
rename to orc-rt/lib/bedrock/TargetDetails.h
diff --git a/orc-rt/lib/executor/ThreadPoolRunner.cpp b/orc-rt/lib/bedrock/ThreadPoolRunner.cpp
similarity index 97%
rename from orc-rt/lib/executor/ThreadPoolRunner.cpp
rename to orc-rt/lib/bedrock/ThreadPoolRunner.cpp
index 43e53d1574bc6..85331b35f58f9 100644
--- a/orc-rt/lib/executor/ThreadPoolRunner.cpp
+++ b/orc-rt/lib/bedrock/ThreadPoolRunner.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ThreadPoolRunner.h"
+#include "orc-rt/bedrock/ThreadPoolRunner.h"
#include <cassert>
diff --git a/orc-rt/lib/executor/Unix/NativeDylibAPIs.inc b/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
similarity index 96%
rename from orc-rt/lib/executor/Unix/NativeDylibAPIs.inc
rename to orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
index ce01a7dbf3983..ec546e5579601 100644
--- a/orc-rt/lib/executor/Unix/NativeDylibAPIs.inc
+++ b/orc-rt/lib/bedrock/Unix/NativeDylibAPIs.inc
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Error.h"
-#include "orc-rt/StringExtras.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/StringExtras.h"
#include <dlfcn.h>
diff --git a/orc-rt/lib/executor/Unix/NativeMemoryAPIs.inc b/orc-rt/lib/bedrock/Unix/NativeMemoryAPIs.inc
similarity index 97%
rename from orc-rt/lib/executor/Unix/NativeMemoryAPIs.inc
rename to orc-rt/lib/bedrock/Unix/NativeMemoryAPIs.inc
index 06dfef38cada3..f54a12616b98f 100644
--- a/orc-rt/lib/executor/Unix/NativeMemoryAPIs.inc
+++ b/orc-rt/lib/bedrock/Unix/NativeMemoryAPIs.inc
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Error.h"
-#include "orc-rt/MemoryFlags.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/MemoryFlags.h"
#include <fcntl.h>
#include <string.h>
diff --git a/orc-rt/lib/executor/darwin/CPUFeatures.cpp b/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
similarity index 97%
rename from orc-rt/lib/executor/darwin/CPUFeatures.cpp
rename to orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
index 5373cd4255f9b..20606da3fe0d2 100644
--- a/orc-rt/lib/executor/darwin/CPUFeatures.cpp
+++ b/orc-rt/lib/bedrock/darwin/CPUFeatures.cpp
@@ -5,7 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
#include "../TargetDetails.h"
diff --git a/orc-rt/lib/executor/darwin/TargetTriple.cpp b/orc-rt/lib/bedrock/darwin/TargetTriple.cpp
similarity index 98%
rename from orc-rt/lib/executor/darwin/TargetTriple.cpp
rename to orc-rt/lib/bedrock/darwin/TargetTriple.cpp
index 61f0648f4154a..e8233b9ead24e 100644
--- a/orc-rt/lib/executor/darwin/TargetTriple.cpp
+++ b/orc-rt/lib/bedrock/darwin/TargetTriple.cpp
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "../TargetDetails.h"
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
#include <TargetConditionals.h>
#include <cstdlib>
diff --git a/orc-rt/lib/executor/windows/CPUFeatures.cpp b/orc-rt/lib/bedrock/linux/CPUFeatures.cpp
similarity index 74%
rename from orc-rt/lib/executor/windows/CPUFeatures.cpp
rename to orc-rt/lib/bedrock/linux/CPUFeatures.cpp
index 20be7e6516825..afac2f174d5c2 100644
--- a/orc-rt/lib/executor/windows/CPUFeatures.cpp
+++ b/orc-rt/lib/bedrock/linux/CPUFeatures.cpp
@@ -1,4 +1,4 @@
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/linux/TargetTriple.cpp b/orc-rt/lib/bedrock/linux/TargetTriple.cpp
similarity index 91%
rename from orc-rt/lib/executor/linux/TargetTriple.cpp
rename to orc-rt/lib/bedrock/linux/TargetTriple.cpp
index f4c3c32faf3f8..ad491962736e4 100644
--- a/orc-rt/lib/executor/linux/TargetTriple.cpp
+++ b/orc-rt/lib/bedrock/linux/TargetTriple.cpp
@@ -5,7 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/sps-ci/AllSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/AllSPSCI.cpp
similarity index 72%
rename from orc-rt/lib/executor/sps-ci/AllSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/AllSPSCI.cpp
index d3f7eb929f146..f14ba3bebc86f 100644
--- a/orc-rt/lib/executor/sps-ci/AllSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/AllSPSCI.cpp
@@ -10,13 +10,13 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/AllSPSCI.h"
-#include "orc-rt/sps-ci/CallSPSCI.h"
-#include "orc-rt/sps-ci/GDBJITRegistrarSPSCI.h"
-#include "orc-rt/sps-ci/MemoryAccessSPSCI.h"
-#include "orc-rt/sps-ci/NativeDylibManagerSPSCI.h"
-#include "orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h"
-#include "orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/AllSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/CallSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/lib/executor/sps-ci/CallSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/CallSPSCI.cpp
similarity index 92%
rename from orc-rt/lib/executor/sps-ci/CallSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/CallSPSCI.cpp
index fd034c61af074..65cb685c174cd 100644
--- a/orc-rt/lib/executor/sps-ci/CallSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/CallSPSCI.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/CallSPSCI.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/sps-ci/CallSPSCI.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <string>
#include <vector>
diff --git a/orc-rt/lib/executor/sps-ci/GDBJITRegistrarSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/GDBJITRegistrarSPSCI.cpp
similarity index 92%
rename from orc-rt/lib/executor/sps-ci/GDBJITRegistrarSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/GDBJITRegistrarSPSCI.cpp
index 332d18b2ecd07..702dba074904d 100644
--- a/orc-rt/lib/executor/sps-ci/GDBJITRegistrarSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/GDBJITRegistrarSPSCI.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/GDBJITRegistrarSPSCI.h"
-#include "orc-rt/SPSAllocAction.h"
+#include "orc-rt/bedrock/sps-ci/GDBJITRegistrarSPSCI.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
#include "../GDBJITRegistrar.h"
diff --git a/orc-rt/lib/executor/sps-ci/MemoryAccessSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/MemoryAccessSPSCI.cpp
similarity index 97%
rename from orc-rt/lib/executor/sps-ci/MemoryAccessSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/MemoryAccessSPSCI.cpp
index a10fe106a0f00..28baa9d66aa21 100644
--- a/orc-rt/lib/executor/sps-ci/MemoryAccessSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/MemoryAccessSPSCI.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/MemoryAccessSPSCI.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include <cstring>
#include <vector>
diff --git a/orc-rt/lib/executor/sps-ci/NativeDylibManagerSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/NativeDylibManagerSPSCI.cpp
similarity index 94%
rename from orc-rt/lib/executor/sps-ci/NativeDylibManagerSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/NativeDylibManagerSPSCI.cpp
index c8de57298fa7f..c7458c050bf0e 100644
--- a/orc-rt/lib/executor/sps-ci/NativeDylibManagerSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/NativeDylibManagerSPSCI.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/NativeDylibManagerSPSCI.h"
-#include "orc-rt/NativeDylibManager.h"
-#include "orc-rt/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h"
+#include "orc-rt/bedrock/NativeDylibManager.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/sps-ci/SimpleNativeMemoryMapSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.cpp
similarity index 93%
rename from orc-rt/lib/executor/sps-ci/SimpleNativeMemoryMapSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.cpp
index 57b2124999f22..6eac16031f2e9 100644
--- a/orc-rt/lib/executor/sps-ci/SimpleNativeMemoryMapSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.cpp
@@ -10,12 +10,12 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h"
+#include "orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h"
-#include "orc-rt/SPSAllocAction.h"
-#include "orc-rt/SPSMemoryFlags.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/SimpleNativeMemoryMap.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
+#include "orc-rt/bedrock/SPSMemoryFlags.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/SimpleNativeMemoryMap.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp b/orc-rt/lib/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp
similarity index 89%
rename from orc-rt/lib/executor/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp
rename to orc-rt/lib/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp
index c6c19c9e2e057..c7830ac682aa1 100644
--- a/orc-rt/lib/executor/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp
+++ b/orc-rt/lib/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.cpp
@@ -11,9 +11,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
-#include "orc-rt/SPSAllocAction.h"
-#include "orc-rt/StandaloneMachOUnwindInfoRegistrar.h"
+#include "orc-rt/bedrock/sps-ci/StandaloneMachOUnwindInfoRegistrarSPSCI.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
+#include "orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h"
namespace orc_rt::sps_ci {
diff --git a/orc-rt/lib/executor/linux/CPUFeatures.cpp b/orc-rt/lib/bedrock/windows/CPUFeatures.cpp
similarity index 74%
rename from orc-rt/lib/executor/linux/CPUFeatures.cpp
rename to orc-rt/lib/bedrock/windows/CPUFeatures.cpp
index 20be7e6516825..afac2f174d5c2 100644
--- a/orc-rt/lib/executor/linux/CPUFeatures.cpp
+++ b/orc-rt/lib/bedrock/windows/CPUFeatures.cpp
@@ -1,4 +1,4 @@
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
namespace orc_rt {
diff --git a/orc-rt/lib/executor/windows/TargetTriple.cpp b/orc-rt/lib/bedrock/windows/TargetTriple.cpp
similarity index 91%
rename from orc-rt/lib/executor/windows/TargetTriple.cpp
rename to orc-rt/lib/bedrock/windows/TargetTriple.cpp
index 0462f6fafbe67..4b38f631fdc3e 100644
--- a/orc-rt/lib/executor/windows/TargetTriple.cpp
+++ b/orc-rt/lib/bedrock/windows/TargetTriple.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
namespace orc_rt {
diff --git a/orc-rt/test/CMakeLists.txt b/orc-rt/test/CMakeLists.txt
index a65cf39213781..d7195cc908134 100644
--- a/orc-rt/test/CMakeLists.txt
+++ b/orc-rt/test/CMakeLists.txt
@@ -19,7 +19,7 @@ if (ORC_RT_LLVM_TOOLS_AVAILABLE)
)
add_custom_target(orc-rt-test-depends DEPENDS ${ORC_RT_TEST_DEPS})
- set_target_properties(orc-rt-test-depends PROPERTIES FOLDER "orc-rt/tests")
+ set_target_properties(orc-rt-test-depends PROPERTIES FOLDER "orc-rt/bedrock/tests")
add_lit_testsuite(check-orc-rt "Running the ORC-RT regression tests"
${CMAKE_CURRENT_BINARY_DIR}/regression
diff --git a/orc-rt/test/tools/CMakeLists.txt b/orc-rt/test/tools/CMakeLists.txt
index f5af23650fed2..0b4ccca9b6453 100644
--- a/orc-rt/test/tools/CMakeLists.txt
+++ b/orc-rt/test/tools/CMakeLists.txt
@@ -7,9 +7,9 @@ add_executable(orc-rt-smoke-check orc-rt-smoke-check.cpp)
# -- logging-check test tool ---
add_executable(orc-rt-log-check orc-rt-log-check.cpp)
target_compile_options(orc-rt-log-check PRIVATE ${ORC_RT_COMPILE_FLAGS})
-target_link_libraries(orc-rt-log-check PRIVATE orc-rt-executor)
+target_link_libraries(orc-rt-log-check PRIVATE orc-rt-bedrock)
add_executable(orc-rt-process-info-check orc-rt-process-info-check.cpp)
target_compile_options(orc-rt-process-info-check PRIVATE ${ORC_RT_COMPILE_FLAGS})
-target_link_libraries(orc-rt-process-info-check PRIVATE orc-rt-executor)
+target_link_libraries(orc-rt-process-info-check PRIVATE orc-rt-bedrock)
diff --git a/orc-rt/test/tools/orc-rt-process-info-check.cpp b/orc-rt/test/tools/orc-rt-process-info-check.cpp
index b76d07d7b8034..6e5f11df81138 100644
--- a/orc-rt/test/tools/orc-rt-process-info-check.cpp
+++ b/orc-rt/test/tools/orc-rt-process-info-check.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt-utils/CommandLine.h"
-#include "orc-rt/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
#include <iostream>
int main(int argc, char *argv[]) {
diff --git a/orc-rt/test/unit/AllocActionTest.cpp b/orc-rt/test/unit/AllocActionTest.cpp
index e9d81e55fb92a..c494af4d5a78f 100644
--- a/orc-rt/test/unit/AllocActionTest.cpp
+++ b/orc-rt/test/unit/AllocActionTest.cpp
@@ -14,7 +14,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/AllocAction.h"
+#include "orc-rt/bedrock/AllocAction.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/AllocActionTestUtils.h b/orc-rt/test/unit/AllocActionTestUtils.h
index 18f8c9b7cbdca..690200357c473 100644
--- a/orc-rt/test/unit/AllocActionTestUtils.h
+++ b/orc-rt/test/unit/AllocActionTestUtils.h
@@ -10,7 +10,7 @@
#define ORC_RT_UNITTEST_ALLOCACTIONTESTUTILS_H
#include "SimplePackedSerializationTestUtils.h"
-#include "orc-rt/AllocAction.h"
+#include "orc-rt/bedrock/AllocAction.h"
#include <optional>
diff --git a/orc-rt/test/unit/BitmaskEnumTest.cpp b/orc-rt/test/unit/BitmaskEnumTest.cpp
index a7d94b84f49d9..19fcea32cb45f 100644
--- a/orc-rt/test/unit/BitmaskEnumTest.cpp
+++ b/orc-rt/test/unit/BitmaskEnumTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/BitmaskEnum.h"
+#include "orc-rt/bedrock/BitmaskEnum.h"
#include "gtest/gtest.h"
#include <string>
diff --git a/orc-rt/test/unit/BootstrapInfoTest.cpp b/orc-rt/test/unit/BootstrapInfoTest.cpp
index 0ec3ee4b69094..4e56c48e1cb38 100644
--- a/orc-rt/test/unit/BootstrapInfoTest.cpp
+++ b/orc-rt/test/unit/BootstrapInfoTest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/BootstrapInfo.h"
-#include "orc-rt/Session.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/BootstrapInfo.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "gtest/gtest.h"
#include "CommonTestUtils.h"
diff --git a/orc-rt/test/unit/CCallbackTest.cpp b/orc-rt/test/unit/CCallbackTest.cpp
index 4a2f50920649a..89d20ac868058 100644
--- a/orc-rt/test/unit/CCallbackTest.cpp
+++ b/orc-rt/test/unit/CCallbackTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/CCallback.h"
+#include "orc-rt/bedrock/CCallback.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/CMakeLists.txt b/orc-rt/test/unit/CMakeLists.txt
index ecbb35af8b880..6d0cca54d15fe 100644
--- a/orc-rt/test/unit/CMakeLists.txt
+++ b/orc-rt/test/unit/CMakeLists.txt
@@ -1,5 +1,5 @@
add_custom_target(OrcRTUnitTests)
-set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "orc-rt/Tests")
+set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "orc-rt/bedrock/Tests")
if (NOT TARGET llvm_gtest)
message(WARNING "orc-rt unittests disabled due to GTest being unavailable; "
@@ -66,8 +66,8 @@ add_orc_rt_unittest(CoreTests
)
target_compile_options(CoreTests PRIVATE ${ORC_RT_COMPILE_FLAGS})
target_link_libraries(CoreTests PRIVATE
- orc-rt-executor
- orc-rt-executor-impl-headers
+ orc-rt-bedrock
+ orc-rt-bedrock-impl-headers
)
# Build a shared library for NativeDylibManager tests.
diff --git a/orc-rt/test/unit/CallSPSCITest.cpp b/orc-rt/test/unit/CallSPSCITest.cpp
index 9c7cd04f315c1..08b256bf34b5c 100644
--- a/orc-rt/test/unit/CallSPSCITest.cpp
+++ b/orc-rt/test/unit/CallSPSCITest.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/CallSPSCI.h"
-#include "orc-rt/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/sps-ci/CallSPSCI.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
#include "DirectCaller.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/CallableTraitsHelperTest.cpp b/orc-rt/test/unit/CallableTraitsHelperTest.cpp
index 484fdbe7baf4b..ca35158441934 100644
--- a/orc-rt/test/unit/CallableTraitsHelperTest.cpp
+++ b/orc-rt/test/unit/CallableTraitsHelperTest.cpp
@@ -13,7 +13,7 @@
// cheap.
//===----------------------------------------------------------------------===//
-#include "orc-rt/CallableTraitsHelper.h"
+#include "orc-rt/bedrock/CallableTraitsHelper.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/CommandLineTest.cpp b/orc-rt/test/unit/CommandLineTest.cpp
index 541b397c3f47f..00359db38ff15 100644
--- a/orc-rt/test/unit/CommandLineTest.cpp
+++ b/orc-rt/test/unit/CommandLineTest.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt-utils/CommandLine.h"
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include "llvm/Testing/Support/Error.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/CommonTestUtils.h b/orc-rt/test/unit/CommonTestUtils.h
index 9c1a922056085..b7da39b0df76a 100644
--- a/orc-rt/test/unit/CommonTestUtils.h
+++ b/orc-rt/test/unit/CommonTestUtils.h
@@ -9,11 +9,11 @@
#ifndef ORC_RT_UNITTEST_COMMONTESTUTILS_H
#define ORC_RT_UNITTEST_COMMONTESTUTILS_H
-#include "orc-rt/Error.h"
-#include "orc-rt/ExecutorProcessInfo.h"
-#include "orc-rt/Session.h"
-#include "orc-rt/WrapperFunction.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/Error.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "orc-rt-c/CoreTypes.h"
#include "orc-rt-c/WrapperFunction.h"
diff --git a/orc-rt/test/unit/CompilerTest.cpp b/orc-rt/test/unit/CompilerTest.cpp
index c47a039a97ee1..77d790cf76d84 100644
--- a/orc-rt/test/unit/CompilerTest.cpp
+++ b/orc-rt/test/unit/CompilerTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Compiler.h"
+#include "orc-rt/bedrock/Compiler.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/DirectCaller.h b/orc-rt/test/unit/DirectCaller.h
index f08ab7f5d5973..8edd125527ec4 100644
--- a/orc-rt/test/unit/DirectCaller.h
+++ b/orc-rt/test/unit/DirectCaller.h
@@ -9,7 +9,7 @@
#ifndef ORC_RT_UNITTEST_DIRECTCALLER_H
#define ORC_RT_UNITTEST_DIRECTCALLER_H
-#include "orc-rt/WrapperFunction.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
#include <memory>
#include <utility>
diff --git a/orc-rt/test/unit/EndianTest.cpp b/orc-rt/test/unit/EndianTest.cpp
index 8bc0006e63e86..cc7e244d2770c 100644
--- a/orc-rt/test/unit/EndianTest.cpp
+++ b/orc-rt/test/unit/EndianTest.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Endian.h"
-#include "orc-rt/bit.h"
+#include "orc-rt/bedrock/Endian.h"
+#include "orc-rt/bedrock/bit.h"
#include "gtest/gtest.h"
#include <algorithm>
diff --git a/orc-rt/test/unit/ErrorCAPITest.cpp b/orc-rt/test/unit/ErrorCAPITest.cpp
index 317db2da5d10c..4b8ecacc7cb1d 100644
--- a/orc-rt/test/unit/ErrorCAPITest.cpp
+++ b/orc-rt/test/unit/ErrorCAPITest.cpp
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt-c/Error.h"
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include "gtest/gtest.h"
#include <cstring>
diff --git a/orc-rt/test/unit/ErrorExceptionInteropTest.cpp b/orc-rt/test/unit/ErrorExceptionInteropTest.cpp
index edaa89aa70d8f..aaf86ddf4a159 100644
--- a/orc-rt/test/unit/ErrorExceptionInteropTest.cpp
+++ b/orc-rt/test/unit/ErrorExceptionInteropTest.cpp
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt-c/config.h"
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include "gtest/gtest.h"
#include <system_error>
diff --git a/orc-rt/test/unit/ErrorTest.cpp b/orc-rt/test/unit/ErrorTest.cpp
index 0fb9abd723551..e772828ef5103 100644
--- a/orc-rt/test/unit/ErrorTest.cpp
+++ b/orc-rt/test/unit/ErrorTest.cpp
@@ -14,7 +14,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Error.h"
+#include "orc-rt/bedrock/Error.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/ExecutorAddressTest.cpp b/orc-rt/test/unit/ExecutorAddressTest.cpp
index 2e049012cbfd2..bfcb0448b1a2a 100644
--- a/orc-rt/test/unit/ExecutorAddressTest.cpp
+++ b/orc-rt/test/unit/ExecutorAddressTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorAddress.h"
+#include "orc-rt/bedrock/ExecutorAddress.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/ExecutorProcessInfoTest.cpp b/orc-rt/test/unit/ExecutorProcessInfoTest.cpp
index 32494f797d2d5..b68d9a02fc8c0 100644
--- a/orc-rt/test/unit/ExecutorProcessInfoTest.cpp
+++ b/orc-rt/test/unit/ExecutorProcessInfoTest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ExecutorProcessInfo.h"
-#include "executor/TargetDetails.h"
-#include "orc-rt/Math.h"
+#include "orc-rt/bedrock/ExecutorProcessInfo.h"
+#include "bedrock/TargetDetails.h"
+#include "orc-rt/bedrock/Math.h"
#include "gtest/gtest.h"
#include <algorithm>
diff --git a/orc-rt/test/unit/InProcessControllerAccessTest.cpp b/orc-rt/test/unit/InProcessControllerAccessTest.cpp
index 2325b7a80d030..148a8bc7cd14d 100644
--- a/orc-rt/test/unit/InProcessControllerAccessTest.cpp
+++ b/orc-rt/test/unit/InProcessControllerAccessTest.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/InProcessControllerAccess.h"
-#include "orc-rt/QueueingRunner.h"
+#include "orc-rt/bedrock/InProcessControllerAccess.h"
+#include "orc-rt/bedrock/QueueingRunner.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/IntervalMapTest.cpp b/orc-rt/test/unit/IntervalMapTest.cpp
index 4b40c8ca9a912..4c81016a254b9 100644
--- a/orc-rt/test/unit/IntervalMapTest.cpp
+++ b/orc-rt/test/unit/IntervalMapTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/IntervalMap.h"
+#include "orc-rt/bedrock/IntervalMap.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/IntervalSetTest.cpp b/orc-rt/test/unit/IntervalSetTest.cpp
index fb9babe8850de..0fb3a612ffd2a 100644
--- a/orc-rt/test/unit/IntervalSetTest.cpp
+++ b/orc-rt/test/unit/IntervalSetTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/IntervalSet.h"
+#include "orc-rt/bedrock/IntervalSet.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/LockedAccessTest.cpp b/orc-rt/test/unit/LockedAccessTest.cpp
index 863c87503727b..4531a5bb72951 100644
--- a/orc-rt/test/unit/LockedAccessTest.cpp
+++ b/orc-rt/test/unit/LockedAccessTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/LockedAccess.h"
+#include "orc-rt/bedrock/LockedAccess.h"
#include "gtest/gtest.h"
#include <mutex>
diff --git a/orc-rt/test/unit/MacroUtilsTest.cpp b/orc-rt/test/unit/MacroUtilsTest.cpp
index 55b6d1de0116b..1e9368b01087a 100644
--- a/orc-rt/test/unit/MacroUtilsTest.cpp
+++ b/orc-rt/test/unit/MacroUtilsTest.cpp
@@ -14,7 +14,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/MacroUtils.h"
+#include "orc-rt/bedrock/MacroUtils.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/MathTest.cpp b/orc-rt/test/unit/MathTest.cpp
index f64aacd092477..8805fc3e81ba2 100644
--- a/orc-rt/test/unit/MathTest.cpp
+++ b/orc-rt/test/unit/MathTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Math.h"
+#include "orc-rt/bedrock/Math.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/MemoryAccessSPSCITest.cpp b/orc-rt/test/unit/MemoryAccessSPSCITest.cpp
index f3ffe669c15d6..f79515dc15d90 100644
--- a/orc-rt/test/unit/MemoryAccessSPSCITest.cpp
+++ b/orc-rt/test/unit/MemoryAccessSPSCITest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/MemoryAccessSPSCI.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/sps-ci/MemoryAccessSPSCI.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
#include "DirectCaller.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/MemoryFlagsTest.cpp b/orc-rt/test/unit/MemoryFlagsTest.cpp
index b8c3a65e25a11..6177492b5928d 100644
--- a/orc-rt/test/unit/MemoryFlagsTest.cpp
+++ b/orc-rt/test/unit/MemoryFlagsTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/MemoryFlags.h"
+#include "orc-rt/bedrock/MemoryFlags.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/NativeDylibManagerSPSCITest.cpp b/orc-rt/test/unit/NativeDylibManagerSPSCITest.cpp
index 59f32b6c5abaa..aaf66d5eb7609 100644
--- a/orc-rt/test/unit/NativeDylibManagerSPSCITest.cpp
+++ b/orc-rt/test/unit/NativeDylibManagerSPSCITest.cpp
@@ -10,10 +10,10 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/NativeDylibManagerSPSCI.h"
-#include "orc-rt/NativeDylibManager.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/sps-ci/NativeDylibManagerSPSCI.h"
+#include "orc-rt/bedrock/NativeDylibManager.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/Session.h"
#include "CommonTestUtils.h"
#include "DirectCaller.h"
diff --git a/orc-rt/test/unit/NativeDylibManagerTest.cpp b/orc-rt/test/unit/NativeDylibManagerTest.cpp
index a3c0344c8eff6..93d9a484d7804 100644
--- a/orc-rt/test/unit/NativeDylibManagerTest.cpp
+++ b/orc-rt/test/unit/NativeDylibManagerTest.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/NativeDylibManager.h"
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/NativeDylibManager.h"
+#include "orc-rt/bedrock/Session.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/ProxyTest.cpp b/orc-rt/test/unit/ProxyTest.cpp
index 3f69ffdb01790..ae86681bdb987 100644
--- a/orc-rt/test/unit/ProxyTest.cpp
+++ b/orc-rt/test/unit/ProxyTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Proxy.h"
+#include "orc-rt/bedrock/Proxy.h"
#include "CommonTestUtils.h"
diff --git a/orc-rt/test/unit/QueueingRunnerTest.cpp b/orc-rt/test/unit/QueueingRunnerTest.cpp
index 415ce1e229ed6..c48ed61533ba8 100644
--- a/orc-rt/test/unit/QueueingRunnerTest.cpp
+++ b/orc-rt/test/unit/QueueingRunnerTest.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/QueueingRunner.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/QueueingRunner.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "gtest/gtest.h"
#include <cstdint>
diff --git a/orc-rt/test/unit/RTTITest.cpp b/orc-rt/test/unit/RTTITest.cpp
index 981929b6c3f31..764784b0dcc94 100644
--- a/orc-rt/test/unit/RTTITest.cpp
+++ b/orc-rt/test/unit/RTTITest.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/RTTI.h"
+#include "orc-rt/bedrock/RTTI.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/SPSAllocActionTest.cpp b/orc-rt/test/unit/SPSAllocActionTest.cpp
index 879aac254dd19..78d1d9177a45b 100644
--- a/orc-rt/test/unit/SPSAllocActionTest.cpp
+++ b/orc-rt/test/unit/SPSAllocActionTest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SPSAllocAction.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
-#include "orc-rt/ExecutorAddress.h"
+#include "orc-rt/bedrock/ExecutorAddress.h"
#include "AllocActionTestUtils.h"
#include "SimplePackedSerializationTestUtils.h"
diff --git a/orc-rt/test/unit/SPSMemoryFlagsTest.cpp b/orc-rt/test/unit/SPSMemoryFlagsTest.cpp
index 94bc0b25fc690..0cfcd2418a1e7 100644
--- a/orc-rt/test/unit/SPSMemoryFlagsTest.cpp
+++ b/orc-rt/test/unit/SPSMemoryFlagsTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SPSMemoryFlags.h"
+#include "orc-rt/bedrock/SPSMemoryFlags.h"
#include "SimplePackedSerializationTestUtils.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/SPSWrapperFunctionBufferTest.cpp b/orc-rt/test/unit/SPSWrapperFunctionBufferTest.cpp
index 99b72b84ca796..6d40a113998e1 100644
--- a/orc-rt/test/unit/SPSWrapperFunctionBufferTest.cpp
+++ b/orc-rt/test/unit/SPSWrapperFunctionBufferTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SPSWrapperFunctionBuffer.h"
+#include "orc-rt/bedrock/SPSWrapperFunctionBuffer.h"
#include "SimplePackedSerializationTestUtils.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/SPSWrapperFunctionTest.cpp b/orc-rt/test/unit/SPSWrapperFunctionTest.cpp
index e025e9fa028de..d52a89b2b0123 100644
--- a/orc-rt/test/unit/SPSWrapperFunctionTest.cpp
+++ b/orc-rt/test/unit/SPSWrapperFunctionTest.cpp
@@ -12,9 +12,9 @@
#include "CommonTestUtils.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/WrapperFunction.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "DirectCaller.h"
diff --git a/orc-rt/test/unit/SessionTest.cpp b/orc-rt/test/unit/SessionTest.cpp
index 9704bd6d4cba9..29d8bb98188c4 100644
--- a/orc-rt/test/unit/SessionTest.cpp
+++ b/orc-rt/test/unit/SessionTest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/Session.h"
-#include "orc-rt/QueueingRunner.h"
-#include "orc-rt/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/QueueingRunner.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
#include "orc-rt-c/Session.h"
diff --git a/orc-rt/test/unit/SimpleNativeMemoryMapSPSCITest.cpp b/orc-rt/test/unit/SimpleNativeMemoryMapSPSCITest.cpp
index 397e699bb6cc9..9525619fab16d 100644
--- a/orc-rt/test/unit/SimpleNativeMemoryMapSPSCITest.cpp
+++ b/orc-rt/test/unit/SimpleNativeMemoryMapSPSCITest.cpp
@@ -10,12 +10,12 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/sps-ci/SimpleNativeMemoryMapSPSCI.h"
-#include "orc-rt/SPSAllocAction.h"
-#include "orc-rt/SPSMemoryFlags.h"
-#include "orc-rt/SPSWrapperFunction.h"
-#include "orc-rt/Session.h"
-#include "orc-rt/SimpleNativeMemoryMap.h"
+#include "orc-rt/bedrock/sps-ci/SimpleNativeMemoryMapSPSCI.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
+#include "orc-rt/bedrock/SPSMemoryFlags.h"
+#include "orc-rt/bedrock/SPSWrapperFunction.h"
+#include "orc-rt/bedrock/Session.h"
+#include "orc-rt/bedrock/SimpleNativeMemoryMap.h"
#include "AllocActionTestUtils.h"
#include "CommonTestUtils.h"
diff --git a/orc-rt/test/unit/SimpleNativeMemoryMapTest.cpp b/orc-rt/test/unit/SimpleNativeMemoryMapTest.cpp
index ce60251697a89..1fb694d83619c 100644
--- a/orc-rt/test/unit/SimpleNativeMemoryMapTest.cpp
+++ b/orc-rt/test/unit/SimpleNativeMemoryMapTest.cpp
@@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SimpleNativeMemoryMap.h"
-#include "orc-rt/SPSAllocAction.h"
-#include "orc-rt/Session.h"
+#include "orc-rt/bedrock/SimpleNativeMemoryMap.h"
+#include "orc-rt/bedrock/SPSAllocAction.h"
+#include "orc-rt/bedrock/Session.h"
#include "AllocActionTestUtils.h"
#include "CommonTestUtils.h"
diff --git a/orc-rt/test/unit/SimplePackedSerializationTest.cpp b/orc-rt/test/unit/SimplePackedSerializationTest.cpp
index 9e9f33feae1d5..dc3e8f3d77f40 100644
--- a/orc-rt/test/unit/SimplePackedSerializationTest.cpp
+++ b/orc-rt/test/unit/SimplePackedSerializationTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
#include "SimplePackedSerializationTestUtils.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/SimplePackedSerializationTestUtils.h b/orc-rt/test/unit/SimplePackedSerializationTestUtils.h
index bf53ec137fe94..ca48a36382d96 100644
--- a/orc-rt/test/unit/SimplePackedSerializationTestUtils.h
+++ b/orc-rt/test/unit/SimplePackedSerializationTestUtils.h
@@ -9,8 +9,8 @@
#ifndef ORC_RT_UNITTEST_SIMPLEPACKEDSERIALIZATIONTESTUTILS_H
#define ORC_RT_UNITTEST_SIMPLEPACKEDSERIALIZATIONTESTUTILS_H
-#include "orc-rt/SimplePackedSerialization.h"
-#include "orc-rt/WrapperFunction.h"
+#include "orc-rt/bedrock/SimplePackedSerialization.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
#include "gtest/gtest.h"
#include <optional>
diff --git a/orc-rt/test/unit/SimpleSymbolTableTest.cpp b/orc-rt/test/unit/SimpleSymbolTableTest.cpp
index 60a5a06934059..d5e93bad9518a 100644
--- a/orc-rt/test/unit/SimpleSymbolTableTest.cpp
+++ b/orc-rt/test/unit/SimpleSymbolTableTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/SimpleSymbolTable.h"
+#include "orc-rt/bedrock/SimpleSymbolTable.h"
#include "gtest/gtest.h"
#include <set>
diff --git a/orc-rt/test/unit/StandaloneMachOUnwindInfoRegistrarTest.cpp b/orc-rt/test/unit/StandaloneMachOUnwindInfoRegistrarTest.cpp
index 8fabc6df096b2..6665a6810cd71 100644
--- a/orc-rt/test/unit/StandaloneMachOUnwindInfoRegistrarTest.cpp
+++ b/orc-rt/test/unit/StandaloneMachOUnwindInfoRegistrarTest.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/StandaloneMachOUnwindInfoRegistrar.h"
+#include "orc-rt/bedrock/StandaloneMachOUnwindInfoRegistrar.h"
#include "gtest/gtest.h"
diff --git a/orc-rt/test/unit/StringExtrasTest.cpp b/orc-rt/test/unit/StringExtrasTest.cpp
index be32717096ed2..e505a066e7eeb 100644
--- a/orc-rt/test/unit/StringExtrasTest.cpp
+++ b/orc-rt/test/unit/StringExtrasTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/StringExtras.h"
+#include "orc-rt/bedrock/StringExtras.h"
#include "gtest/gtest.h"
#include <cstdint>
diff --git a/orc-rt/test/unit/StringPoolTest.cpp b/orc-rt/test/unit/StringPoolTest.cpp
index bb8d92e32969f..7e136f86bc5e7 100644
--- a/orc-rt/test/unit/StringPoolTest.cpp
+++ b/orc-rt/test/unit/StringPoolTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/StringPool.h"
+#include "orc-rt/bedrock/StringPool.h"
#include "gtest/gtest.h"
#include <unordered_set>
diff --git a/orc-rt/test/unit/TaskGroupTest.cpp b/orc-rt/test/unit/TaskGroupTest.cpp
index d655bb6e67e79..2a11a600a7d0d 100644
--- a/orc-rt/test/unit/TaskGroupTest.cpp
+++ b/orc-rt/test/unit/TaskGroupTest.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/TaskGroup.h"
+#include "orc-rt/bedrock/TaskGroup.h"
#include "gtest/gtest.h"
#include <atomic>
diff --git a/orc-rt/test/unit/ThreadPoolRunnerTest.cpp b/orc-rt/test/unit/ThreadPoolRunnerTest.cpp
index fc863fac2853b..3d340e255a2e9 100644
--- a/orc-rt/test/unit/ThreadPoolRunnerTest.cpp
+++ b/orc-rt/test/unit/ThreadPoolRunnerTest.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/ThreadPoolRunner.h"
+#include "orc-rt/bedrock/ThreadPoolRunner.h"
#include "gtest/gtest.h"
#include <atomic>
diff --git a/orc-rt/test/unit/WrapperFunctionBufferTest.cpp b/orc-rt/test/unit/WrapperFunctionBufferTest.cpp
index 00fc891d84726..d54760420c3b3 100644
--- a/orc-rt/test/unit/WrapperFunctionBufferTest.cpp
+++ b/orc-rt/test/unit/WrapperFunctionBufferTest.cpp
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "orc-rt-c/WrapperFunction.h"
-#include "orc-rt/WrapperFunction.h"
+#include "orc-rt/bedrock/WrapperFunction.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/bind-test.cpp b/orc-rt/test/unit/bind-test.cpp
index 93a61e6387b49..2342d523e1c68 100644
--- a/orc-rt/test/unit/bind-test.cpp
+++ b/orc-rt/test/unit/bind-test.cpp
@@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//
#include "CommonTestUtils.h"
-#include "orc-rt/bind.h"
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/bind.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/bit-test.cpp b/orc-rt/test/unit/bit-test.cpp
index 2a266e670dfc8..7a589ea2b96dc 100644
--- a/orc-rt/test/unit/bit-test.cpp
+++ b/orc-rt/test/unit/bit-test.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/bit.h"
+#include "orc-rt/bedrock/bit.h"
#include "gtest/gtest.h"
#include <cstdint>
diff --git a/orc-rt/test/unit/iterator_range-test.cpp b/orc-rt/test/unit/iterator_range-test.cpp
index 00262095396b7..16cba5c231c74 100644
--- a/orc-rt/test/unit/iterator_range-test.cpp
+++ b/orc-rt/test/unit/iterator_range-test.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/iterator_range.h"
+#include "orc-rt/bedrock/iterator_range.h"
#include "gtest/gtest.h"
#include <type_traits>
diff --git a/orc-rt/test/unit/move_only_function-test.cpp b/orc-rt/test/unit/move_only_function-test.cpp
index 00ad8483ffc87..d9178788f2d76 100644
--- a/orc-rt/test/unit/move_only_function-test.cpp
+++ b/orc-rt/test/unit/move_only_function-test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/move_only_function.h"
+#include "orc-rt/bedrock/move_only_function.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/scope_exit-test.cpp b/orc-rt/test/unit/scope_exit-test.cpp
index 01e5805126d77..24d7983e5900e 100644
--- a/orc-rt/test/unit/scope_exit-test.cpp
+++ b/orc-rt/test/unit/scope_exit-test.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/scope_exit.h"
+#include "orc-rt/bedrock/scope_exit.h"
#include "gtest/gtest.h"
using namespace orc_rt;
diff --git a/orc-rt/test/unit/span-test.cpp b/orc-rt/test/unit/span-test.cpp
index 98b450bccf360..40ad1bace514e 100644
--- a/orc-rt/test/unit/span-test.cpp
+++ b/orc-rt/test/unit/span-test.cpp
@@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//
-#include "orc-rt/span.h"
+#include "orc-rt/bedrock/span.h"
#include "gtest/gtest.h"
#include <string>
diff --git a/orc-rt/tools/ogre/CMakeLists.txt b/orc-rt/tools/ogre/CMakeLists.txt
index 6b42eb636ec96..bb95190619b7f 100644
--- a/orc-rt/tools/ogre/CMakeLists.txt
+++ b/orc-rt/tools/ogre/CMakeLists.txt
@@ -1,2 +1,2 @@
add_executable(ogre ogre.cpp)
-target_link_libraries(ogre PRIVATE orc-rt-executor)
+target_link_libraries(ogre PRIVATE orc-rt-bedrock)
More information about the llvm-commits
mailing list