1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 09:13:08 +00:00

Use -O3 for all compilers (including ICC)

There seems to be no benefit from using -fast over -O3 with icc.
So use -O3 everywhere.

No functional change

Resolves #652
This commit is contained in:
erbsenzaehler 2016-04-24 00:55:56 +01:00 committed by Joona Kiiski
parent c737062436
commit 4048bae47b

View file

@ -231,19 +231,20 @@ ifneq ($(comp),mingw)
endif endif
endif endif
### 3.4 Debugging ### 3.2 Debugging
ifeq ($(debug),no) ifeq ($(debug),no)
CXXFLAGS += -DNDEBUG CXXFLAGS += -DNDEBUG
else else
CXXFLAGS += -g CXXFLAGS += -g
endif endif
### 3.5 Optimization ### 3.3 Optimization
ifeq ($(optimize),yes) ifeq ($(optimize),yes)
ifeq ($(comp),gcc)
CXXFLAGS += -O3 CXXFLAGS += -O3
ifeq ($(comp),gcc)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
ifeq ($(arch),i386) ifeq ($(arch),i386)
CXXFLAGS += -mdynamic-no-pic CXXFLAGS += -mdynamic-no-pic
@ -258,21 +259,13 @@ ifeq ($(optimize),yes)
endif endif
endif endif
ifeq ($(comp),mingw)
CXXFLAGS += -O3
endif
ifeq ($(comp),icc) ifeq ($(comp),icc)
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
CXXFLAGS += -fast -mdynamic-no-pic CXXFLAGS += -mdynamic-no-pic
else
CXXFLAGS += -fast
endif endif
endif endif
ifeq ($(comp),clang) ifeq ($(comp),clang)
CXXFLAGS += -O3
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
ifeq ($(pext),no) ifeq ($(pext),no)
CXXFLAGS += -flto CXXFLAGS += -flto
@ -288,12 +281,12 @@ ifeq ($(optimize),yes)
endif endif
endif endif
### 3.6. Bits ### 3.4 Bits
ifeq ($(bits),64) ifeq ($(bits),64)
CXXFLAGS += -DIS_64BIT CXXFLAGS += -DIS_64BIT
endif endif
### 3.7 prefetch ### 3.5 prefetch
ifeq ($(prefetch),yes) ifeq ($(prefetch),yes)
ifeq ($(sse),yes) ifeq ($(sse),yes)
CXXFLAGS += -msse CXXFLAGS += -msse
@ -303,7 +296,7 @@ else
CXXFLAGS += -DNO_PREFETCH CXXFLAGS += -DNO_PREFETCH
endif endif
### 3.9 popcnt ### 3.6 popcnt
ifeq ($(popcnt),yes) ifeq ($(popcnt),yes)
ifeq ($(comp),icc) ifeq ($(comp),icc)
CXXFLAGS += -msse3 -DUSE_POPCNT CXXFLAGS += -msse3 -DUSE_POPCNT
@ -312,7 +305,7 @@ ifeq ($(popcnt),yes)
endif endif
endif endif
### 3.10 pext ### 3.7 pext
ifeq ($(pext),yes) ifeq ($(pext),yes)
CXXFLAGS += -DUSE_PEXT CXXFLAGS += -DUSE_PEXT
ifeq ($(comp),$(filter $(comp),gcc clang mingw)) ifeq ($(comp),$(filter $(comp),gcc clang mingw))
@ -320,7 +313,7 @@ ifeq ($(pext),yes)
endif endif
endif endif
### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw under Windows. ### 3.8 Link Time Optimization, it works since gcc 4.5 but not on mingw under Windows.
### This is a mix of compile and link time options because the lto link phase ### This is a mix of compile and link time options because the lto link phase
### needs access to the optimization flags. ### needs access to the optimization flags.
ifeq ($(comp),gcc) ifeq ($(comp),gcc)
@ -343,7 +336,7 @@ ifeq ($(comp),mingw)
endif endif
endif endif
### 3.12 Android 5 can only run position independent executables. Note that this ### 3.9 Android 5 can only run position independent executables. Note that this
### breaks Android 4.0 and earlier. ### breaks Android 4.0 and earlier.
ifeq ($(arch),armv7) ifeq ($(arch),armv7)
CXXFLAGS += -fPIE CXXFLAGS += -fPIE