teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove -falign-loops and -falign-jumps from Makefile

Browse source 
Clang warns and errors because of them on various platforms.

Based on pull request #43 by @xhairball.
This commit is contained in:
Zack Middleton 2014-03-24 13:09:49 -05:00
parent 9f3fd12501
commit cf7d8ef9cf
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -327,15 +327,13 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \ OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -falign-functions=2 -fstrength-reduce
-fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true HAVE_VM_COMPILED = true
else else
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \ OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
-funroll-loops -falign-loops=2 -falign-jumps=2 \ -funroll-loops -falign-functions=2 -fstrength-reduce
-falign-functions=2 -fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true HAVE_VM_COMPILED=true
else else
@ -485,7 +483,6 @@ ifeq ($(PLATFORM),darwin)
$(LIBSDIR)/macosx/libSDL-1.2.0.dylib $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
OPTIMIZEVM += -falign-loops=16
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
SHLIBEXT=dylib SHLIBEXT=dylib
@ -560,15 +557,13 @@ ifeq ($(PLATFORM),mingw32)
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
OPTIMIZEVM = -O3 -fno-omit-frame-pointer \ OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -funroll-loops -falign-functions=2 -fstrength-reduce
-fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) --fast-math OPTIMIZE = $(OPTIMIZEVM) --fast-math
HAVE_VM_COMPILED = true HAVE_VM_COMPILED = true
endif endif
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \ OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -funroll-loops -falign-functions=2 -fstrength-reduce
-fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true HAVE_VM_COMPILED = true
endif endif
@ -713,15 +708,13 @@ ifeq ($(PLATFORM),openbsd)
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \ OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -falign-functions=2 -fstrength-reduce
-fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true HAVE_VM_COMPILED = true
else else
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \ OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
-funroll-loops -falign-loops=2 -falign-jumps=2 \ -funroll-loops -falign-functions=2 -fstrength-reduce
-falign-functions=2 -fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true HAVE_VM_COMPILED=true
else else
@ -859,7 +852,6 @@ ifeq ($(PLATFORM),sunos)
else else
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
OPTIMIZEVM += -march=i586 -fomit-frame-pointer \ OPTIMIZEVM += -march=i586 -fomit-frame-pointer \
-falign-loops=2 -falign-jumps=2 \
-falign-functions=2 -fstrength-reduce -falign-functions=2 -fstrength-reduce
HAVE_VM_COMPILED=true HAVE_VM_COMPILED=true
BASE_CFLAGS += -m32 BASE_CFLAGS += -m32