[iortcw] 342/497: All: Remove some unneeded / unsupported compiler optimizations
Simon McVittie
smcv at debian.org
Fri Sep 8 10:37:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 61e21399931ae68e9df2d4f16a4ca1ac8f41000c
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Tue Jun 9 18:38:18 2015 -0400
All: Remove some unneeded / unsupported compiler optimizations
---
MP/Makefile | 54 +++++++++++-------------------------------------------
SP/Makefile | 54 +++++++++++-------------------------------------------
2 files changed, 22 insertions(+), 86 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index c152830..4954a7f 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -373,24 +373,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
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -653,21 +645,13 @@ ifeq ($(PLATFORM),mingw32)
endif
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fno-omit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
FILE_ARCH=x64
endif
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
@@ -767,7 +751,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
@@ -820,24 +804,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
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -965,22 +941,14 @@ ifeq ($(PLATFORM),sunos)
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
- OPTIMIZEVM = -O3 -funroll-loops
+ OPTIMIZEVM = -O3
ifeq ($(ARCH),sparc)
OPTIMIZEVM += -O3 -mtune=ultrasparc3 -mv8plus -mno-faster-structs
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
HAVE_VM_COMPILED=true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM += -march=i586 -fomit-frame-pointer
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM += -march=i586
HAVE_VM_COMPILED=true
BASE_CFLAGS += -m32
CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA
diff --git a/SP/Makefile b/SP/Makefile
index b6bbe0c..b263656 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -365,24 +365,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
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -645,21 +637,13 @@ ifeq ($(PLATFORM),mingw32)
endif
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fno-omit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
FILE_ARCH=x64
endif
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
@@ -759,7 +743,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
@@ -812,24 +796,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
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer -funroll-loops
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM = -O3 -march=i586
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -957,22 +933,14 @@ ifeq ($(PLATFORM),sunos)
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
- OPTIMIZEVM = -O3 -funroll-loops
+ OPTIMIZEVM = -O3
ifeq ($(ARCH),sparc)
OPTIMIZEVM += -O3 -mtune=ultrasparc3 -mv8plus -mno-faster-structs
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
HAVE_VM_COMPILED=true
else
ifeq ($(ARCH),x86)
- OPTIMIZEVM += -march=i586 -fomit-frame-pointer
- # clang 3.5 doesn't support this
- ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
- OPTIMIZEVM += -falign-functions=2 -fstrength-reduce
- endif
+ OPTIMIZEVM += -march=i586
HAVE_VM_COMPILED=true
BASE_CFLAGS += -m32
CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list