Skip to content

Neboat/beta3rc1 fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neboat merged 3 commits into from
Aug 29, 2020
+6 −0
Merged

Neboat/beta3rc1 fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec44c7c
[cmake] Adjust check for -fopencilk CXX compiler flag to work with Op…
neboat Aug 27, 2020
361f0ed
[cilksan] Only dynamically interpose mremap symbol on Linux. In part…
neboat Aug 27, 2020
0ce67f5
[cmake] When checking if the compiler supports -fopencilk, use the -f…
neboat Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions compiler-rt/cmake/config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ check_cxx_compiler_flag("-Werror -msse4.2" COMPILER_RT_HAS_MSSE4_2_FLAG)
check_cxx_compiler_flag(--sysroot=. COMPILER_RT_HAS_SYSROOT_FLAG)
check_cxx_compiler_flag("-Werror -mcrc" COMPILER_RT_HAS_MCRC_FLAG)
check_cxx_compiler_flag(-fno-partial-inlining COMPILER_RT_HAS_FNO_PARTIAL_INLINING_FLAG)
set(OLD_CMAKE_REQUIRED_LINK_OPTIONS ${CMAKE_REQUIRED_LINK_OPTIONS})
set(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
if (NOT APPLE)
find_library(LIBOPENCILK opencilk
Expand All @@ -89,9 +90,12 @@ else()
endif()
if (IS_ABSOLUTE ${LIBOPENCILK})
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBOPENCILK})
else()
list(APPEND CMAKE_REQUIRED_LINK_OPTIONS -fopencilk)
endif()
check_cxx_compiler_flag(-fopencilk COMPILER_RT_HAS_CILK_FLAG)
set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
set(CMAKE_REQUIRED_LINK_OPTIONS ${OLD_CMAKE_REQUIRED_LINK_OPTIONS})

if(NOT WIN32 AND NOT CYGWIN)
# MinGW warns if -fvisibility-inlines-hidden is used.
Expand Down
2 changes: 2 additions & 0 deletions compiler-rt/lib/cilksan/drivercsan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,10 +966,12 @@ static void initialize_memory_functions() {
if (error != NULL)
goto error_exit;

#if __linux__
real_mremap = (mremap_t)dlsym(RTLD_NEXT, "mremap");
error = dlerror();
if (error != NULL)
goto error_exit;
#endif // __linux__

mem_initialized = 1;
enable_checking();
Expand Down