Commit 84597823 authored by Ramon Nou's avatar Ramon Nou
Browse files

add GSL 

restores noexecstack
Avoids the constructor with ENABLE INIT with the user library
parent 3eddeec5

include/client/preload.hpp

+1 −2
Original line number Diff line number Diff line
@@ -57,13 +57,12 @@ init_preload() __attribute__((constructor)); 


void

destroy_preload() __attribute__((destructor));

#else

#elif ENABLE_INIT

void

init_libc() __attribute__((constructor));



void

destroy_libc() __attribute__((destructor));



#endif



void

src/client/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ target_compile_definitions(gkfs_user_lib PUBLIC BYPASS_SYSCALL) 
target_link_options(gkfs_user_lib PRIVATE -z noexecstack)

endif() 



target_compile_definitions(gkfs_libc_intercept PUBLIC BYPASS_SYSCALL)

target_link_options(gkfs_libc_intercept PRIVATE) #-z noexecstack

target_compile_definitions(gkfs_libc_intercept PUBLIC BYPASS_SYSCALL ENABLE_INIT)

target_link_options(gkfs_libc_intercept PRIVATE -z noexecstack)



if (GKFS_ENABLE_AGIOS)

    target_compile_definitions(gkfs_intercept PUBLIC GKFS_ENABLE_AGIOS)
@@ -162,6 +162,7 @@ target_link_libraries( 
    hermes

    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

)



set_target_properties(gkfs_user_lib