From 6d8ee8c6b559e31f433bca9f36bfd0bdf8e5ac72 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Thu, 25 Feb 2021 19:40:10 +0100 Subject: [PATCH] fix for #6395 --- OMCompiler/Compiler/runtime/omc_config.h | 5 ++--- OMCompiler/configure.ac | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/OMCompiler/Compiler/runtime/omc_config.h b/OMCompiler/Compiler/runtime/omc_config.h index cef500af2b7..f04f532713a 100644 --- a/OMCompiler/Compiler/runtime/omc_config.h +++ b/OMCompiler/Compiler/runtime/omc_config.h @@ -90,7 +90,6 @@ /* adrpo: add -loleaut32 as is used by ExternalMedia */ #define DEFAULT_LDFLAGS "-fopenmp -Wl,-Bstatic -lregex -ltre -lintl -liconv -lexpat -lomcgc -lpthread -loleaut32 -limagehlp -lhdf5 -lz -lszip -Wl,-Bdynamic" - #define CONFIG_WITH_OPENMP 1 #define CONFIG_DEFAULT_OPENMODELICAHOME NULL @@ -105,9 +104,9 @@ * Visual Studio then use the SSE instructions, * not the normal i387 FPU */ - #define DEFAULT_CFLAGS "-falign-functions -mstackrealign -msse2 -mfpmath=sse ${MODELICAUSERCFLAGS}" + #define DEFAULT_CFLAGS "-Wno-parentheses-equality -falign-functions -mstackrealign -msse2 -mfpmath=sse ${MODELICAUSERCFLAGS}" #else - #define DEFAULT_CFLAGS "-falign-functions ${MODELICAUSERCFLAGS}" + #define DEFAULT_CFLAGS "-Wno-parentheses-equality -falign-functions ${MODELICAUSERCFLAGS}" #endif /* for windows/mingw we don't need -fPIC for x86_64 target, also clang doesn't support it, gcc ignores it */ diff --git a/OMCompiler/configure.ac b/OMCompiler/configure.ac index 720e7bfcc56..3f11a8788c7 100644 --- a/OMCompiler/configure.ac +++ b/OMCompiler/configure.ac @@ -462,7 +462,7 @@ if test -z "$RUNTIMECFLAGS"; then CFLAGS="$FPIC" AC_MSG_CHECKING([runtime compiler CFLAGS]) RUNTIMECFLAGS="$FPIC" - for flag in -falign-functions -mfpmath=sse -fno-dollars-in-identifiers; do + for flag in -falign-functions -mfpmath=sse -fno-dollars-in-identifiers -Wno-parentheses-equality; do CFLAGS="$FPIC $flag -Werror" AC_TRY_LINK([], [return 0;], [RUNTIMECFLAGS="$RUNTIMECFLAGS $flag"],[]) done