DeforaNetworks/deepstate
3
0
Fork 0
Code Releases Activity

Merge pull request #117 from trailofbits/disable_static_on_macos

Browse Source 
Disable static builds on macOS
This commit is contained in:
Peter Goodman
2018-09-27 15:12:48 -07:00
committed by GitHub
parent 0c43b4004d 9a8e5cca23
commit 42b7068e2b
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -65,9 +65,10 @@ target_compile_options(${PROJECT_NAME} PUBLIC -mno-avx)
target_compile_options(${PROJECT_NAME}32 PUBLIC -m32 -g3 -mno-avx) target_compile_options(${PROJECT_NAME}32 PUBLIC -m32 -g3 -mno-avx)
target_link_libraries(${PROJECT_NAME} -static "-Wl,--allow-multiple-definition,--no-export-dynamic") if (NOT APPLE)
target_link_libraries(${PROJECT_NAME} -static "-Wl,--allow-multiple-definition,--no-export-dynamic")
target_link_libraries(${PROJECT_NAME}32 -static "-Wl,--allow-multiple-definition,--no-export-dynamic") target_link_libraries(${PROJECT_NAME}32 -static "-Wl,--allow-multiple-definition,--no-export-dynamic")
endif()
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PUBLIC SYSTEM "${CMAKE_SOURCE_DIR}/src/include" PUBLIC SYSTEM "${CMAKE_SOURCE_DIR}/src/include"

9
examples/CMakeLists.txt
View File

@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_executable(Crash Crash.cpp) add_executable(Crash Crash.cpp)
target_link_libraries(Crash deepstate) target_link_libraries(Crash deepstate)
@@ -103,9 +102,11 @@ if (BUILD_LIBFUZZER)
set_target_properties(StreamingAndFormatting_LF PROPERTIES COMPILE_DEFINITIONS "LIBFUZZER") set_target_properties(StreamingAndFormatting_LF PROPERTIES COMPILE_DEFINITIONS "LIBFUZZER")
endif() endif()
add_executable(Squares Squares.c) if (NOT APPLE)
target_link_libraries(Squares deepstate) add_executable(Squares Squares.c)
set_target_properties(Squares PROPERTIES COMPILE_DEFINITIONS "DEEPSTATE_TEST") target_link_libraries(Squares deepstate)
set_target_properties(Squares PROPERTIES COMPILE_DEFINITIONS "DEEPSTATE_TEST")
endif()
add_executable(TakeOver TakeOver.cpp) add_executable(TakeOver TakeOver.cpp)
target_link_libraries(TakeOver deepstate) target_link_libraries(TakeOver deepstate)

9
src/include/deepstate/Klee.h
View File

@@ -97,7 +97,12 @@ static void klee_posix_prefer_cex(void *object, uintptr_t condition) {
/* static KLEE_GET_VALUE(d, double); */ /* static KLEE_GET_VALUE(d, double); */
static KLEE_GET_VALUE(l, long) { static KLEE_GET_VALUE(l, long) {
DeepState_MinInt(val); if (sizeof(long) == sizeof(int)) {
return DeepState_MinInt((int) val);
} else {
// TODO: We need a MinInt64 function.
return DeepState_MinInt(val);
}
} }
/* Unsupported. */ /* Unsupported. */
@@ -105,7 +110,7 @@ static KLEE_GET_VALUE(l, long) {
/* TODO(joe): Implement */ /* TODO(joe): Implement */
static KLEE_GET_VALUE(_i32, int32_t) { static KLEE_GET_VALUE(_i32, int32_t) {
DeepState_MinInt(val); return DeepState_MinInt(val);
} }
/* TODO(joe): Implement */ /* TODO(joe): Implement */