From 528d8a3948a27dbdcb8123b42ff7b8375a7277aa Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 28 Sep 2013 23:57:26 +0400 Subject: [PATCH] Remove OpenMP flags for now --- novacoin-qt.pro | 3 --- src/makefile.bsd | 2 +- src/makefile.linux-mingw | 2 +- src/makefile.mingw | 2 +- src/makefile.osx | 2 +- src/makefile.unix | 2 +- src/zerocoin/Zerocoin.h | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 9513cd3..d959efe 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -31,8 +31,6 @@ contains(RELEASE, 1) { } } -QMAKE_LFLAGS *= -fopenmp - !win32 { # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 @@ -147,7 +145,6 @@ contains(USE_O3, 1) { QMAKE_CFLAGS += -msse2 } -QMAKE_CXXFLAGS +=-fopenmp QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector # Input diff --git a/src/makefile.bsd b/src/makefile.bsd index 03ba309..550fa73 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -95,7 +95,7 @@ DEBUGFLAGS=-g # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. -xCXXFLAGS=-O0 -msse2 -pthread -fopenmp -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ +xCXXFLAGS=-O0 -msse2 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 5e9f9d0..014c87f 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -40,7 +40,7 @@ LIBS= \ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g -CFLAGS=-O3 -msse2 -fopenmp -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CFLAGS=-O3 -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -static-libgcc -static-libstdc++ TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) diff --git a/src/makefile.mingw b/src/makefile.mingw index a9b83a7..1d329ce 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -28,7 +28,7 @@ LIBS= \ DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g -CFLAGS=-mthreads -fopenmp -O3 -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CFLAGS=-mthreads -O3 -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) diff --git a/src/makefile.osx b/src/makefile.osx index c3a40b9..c62afb1 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -67,7 +67,7 @@ CFLAGS = -g -msse2 endif # ppc doesn't work because we don't support big-endian -CFLAGS += -fopenmp -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ +CFLAGS += -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) OBJS= \ diff --git a/src/makefile.unix b/src/makefile.unix index 4647d95..d36d65a 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -101,7 +101,7 @@ endif # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. -xCXXFLAGS=-O2 $(EXT_OPTIONS) -fopenmp -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ +xCXXFLAGS=-O2 $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only diff --git a/src/zerocoin/Zerocoin.h b/src/zerocoin/Zerocoin.h index a7f69dc..f40f03d 100644 --- a/src/zerocoin/Zerocoin.h +++ b/src/zerocoin/Zerocoin.h @@ -31,7 +31,7 @@ #define ZEROCOIN_SERIALNUMBER_PROOF "SERIALNUMBER_PROOF" // Activate multithreaded mode for proof verification -#define ZEROCOIN_THREADING 1 +#define ZEROCOIN_THREADING 0 // Uses a fast technique for coin generation. Could be more vulnerable // to timing attacks. Turn off if an attacker can measure coin minting time. -- 1.7.1