summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2015-06-06 22:42:10 +0100
committerTim Angus <tim@ngus.net>2015-06-07 12:03:59 +0100
commitbdbc616c65cdfa02cfab01cb6b067e0865c8245b (patch)
tree2b2320edcf5b3b17c94d33dd48a4b6ffb70e6342
parentfaacb4870df52a38feb8d33658954c5353c8bf14 (diff)
clang gets upset by some of these compiler options (and they're probably pretty pointless in 2015 anyway)
-rw-r--r--Makefile24
1 files changed, 9 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index fbd1b332..c7289e19 100644
--- a/Makefile
+++ b/Makefile
@@ -323,18 +323,16 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
- OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -553,14 +551,12 @@ ifeq ($(PLATFORM),mingw32)
endif
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
@@ -658,7 +654,7 @@ ifeq ($(PLATFORM),freebsd)
CLIENT_CFLAGS += $(SDL_CFLAGS)
HAVE_VM_COMPILED = true
- OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
SHLIBEXT=so
@@ -711,18 +707,16 @@ ifeq ($(PLATFORM),openbsd)
-pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS += $(SDL_CFLAGS)
- OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else