From fc8b4f24ca97cbe1d7490fd88973bd92998971f3 Mon Sep 17 00:00:00 2001 From: Greg Bentley Date: Mon, 7 Aug 2017 15:48:03 -0700 Subject: [PATCH 1/2] Fixes for building with icc. --- CMake/HPHPCompiler.cmake | 2 +- hphp/runtime/vm/native.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMake/HPHPCompiler.cmake b/CMake/HPHPCompiler.cmake index 62c4089bb2645f..aa5ee42693c7f6 100644 --- a/CMake/HPHPCompiler.cmake +++ b/CMake/HPHPCompiler.cmake @@ -36,7 +36,7 @@ CHECK_CXX_SOURCE_COMPILES(" int main() { return 0; }" IS_PPC64) # using Clang or GCC -if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") +if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") # Warnings to disable by name, -Wno-${name} set(DISABLED_NAMED_WARNINGS) list(APPEND DISABLED_NAMED_WARNINGS diff --git a/hphp/runtime/vm/native.h b/hphp/runtime/vm/native.h index 7fbd758ef4fcb0..bcaf09d5cd0730 100644 --- a/hphp/runtime/vm/native.h +++ b/hphp/runtime/vm/native.h @@ -231,6 +231,7 @@ bool coerceFCallArgs(TypedValue* args, * calling. */ template +__attribute__((noinline)) void callFunc(const Func* func, void* ctx, TypedValue* args, int32_t numNonDefault, TypedValue& ret); From 8f322bfc830268727d77f68451cb0ec515844962 Mon Sep 17 00:00:00 2001 From: Greg Bentley Date: Mon, 4 Sep 2017 17:25:12 -0700 Subject: [PATCH 2/2] Update HPHPCompiler.cmake --- CMake/HPHPCompiler.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMake/HPHPCompiler.cmake b/CMake/HPHPCompiler.cmake index aa5ee42693c7f6..33d53119fd463d 100644 --- a/CMake/HPHPCompiler.cmake +++ b/CMake/HPHPCompiler.cmake @@ -290,10 +290,6 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2 -march=core-avx2") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -mavx2 -march=core-avx2") endif() -# using Intel C++ -elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -w") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -fno-omit-frame-pointer -Wall -Woverloaded-virtual -Wno-deprecated -w1 -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names") # using Visual Studio C++ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") message(WARNING "MSVC support is VERY experimental. It will likely not compile, and is intended for the utterly insane.")