Skip to content

Commit 9576b7b

Browse files
authored
C++ entry points (#7552)
1 parent 68ed097 commit 9576b7b

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

cmake/ccf_app.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,13 @@ function(add_ccf_app name)
3030
add_warning_checks(${name})
3131

3232
target_link_libraries(
33-
${name} PRIVATE ${PARSED_ARGS_LINK_LIBS} ccf ccf_launcher
33+
${name} PRIVATE ${PARSED_ARGS_LINK_LIBS} ccf_launcher ccf
3434
)
3535

3636
if(NOT (SAN OR TSAN))
3737
target_link_options(${name} PRIVATE LINKER:--no-undefined)
3838
endif()
3939

40-
target_link_options(
41-
${name} PRIVATE
42-
LINKER:--undefined=enclave_create_node,--undefined=enclave_run
43-
)
44-
4540
set_property(TARGET ${name} PROPERTY POSITION_INDEPENDENT_CODE ON)
4641

4742
add_san(${name})

src/enclave/entry_points.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <cstdint>
99

10-
extern "C"
10+
namespace ccf
1111
{
1212
CreateNodeStatus enclave_create_node(
1313
const EnclaveConfig& enclave_config,

src/enclave/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace
2222
std::atomic<uint16_t> num_pending_threads = 0;
2323
std::atomic<uint16_t> num_complete_threads = 0;
2424

25-
extern "C"
25+
namespace ccf
2626
{
2727
CreateNodeStatus enclave_create_node(
2828
const EnclaveConfig& enclave_config,

0 commit comments

Comments
 (0)