Skip to content

Commit

Permalink
clang gets upset by some of these compiler options (and they're proba…
Browse files Browse the repository at this point in the history
…bly pretty pointless in 2015 anyway)
  • Loading branch information
timangus committed Jun 6, 2015
1 parent a0d2e85 commit 92b74e5
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions Makefile
Expand Up @@ -336,18 +336,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
Expand Down Expand Up @@ -566,14 +564,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
Expand Down Expand Up @@ -671,7 +667,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
Expand Down Expand Up @@ -724,18 +720,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
Expand Down

0 comments on commit 92b74e5

Please sign in to comment.