summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configurecompiler.cmake3
-rw-r--r--src/jit/CMakeLists.txt2
-rw-r--r--src/pal/inc/rt/cpp/emmintrin.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake
index 5b6d767..0ad08eb 100644
--- a/configurecompiler.cmake
+++ b/configurecompiler.cmake
@@ -509,6 +509,9 @@ if (CLR_CMAKE_PLATFORM_UNIX)
add_compile_options(-Wno-unused-but-set-variable)
add_compile_options(-fms-extensions)
add_compile_options(-Wno-unknown-pragmas)
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
+ add_compile_options(-Wno-nonnull-compare)
+ endif()
if (COMPILER_SUPPORTS_F_ALIGNED_NEW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new")
endif()
diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt
index c246efa..5e7c9c5 100644
--- a/src/jit/CMakeLists.txt
+++ b/src/jit/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories("./jitstd")
include_directories("../inc")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- add_compile_options(-fpermissive)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
add_compile_options(-Wno-error)
endif()
diff --git a/src/pal/inc/rt/cpp/emmintrin.h b/src/pal/inc/rt/cpp/emmintrin.h
index 14b72be..cd633a3 100644
--- a/src/pal/inc/rt/cpp/emmintrin.h
+++ b/src/pal/inc/rt/cpp/emmintrin.h
@@ -40,7 +40,7 @@ typedef char __v16qi __attribute__((__vector_size__(16)));
/* Define the default attribute for the functions in this file. */
-#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("sse2")))
+#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, NODEBUG_ATTRIBUTE, __target__("sse2")))
/// \brief Performs a bitwise OR of two 128-bit integer vectors.
///