[iortcw] 296/497: All: Fix some optimization warnings when building with clang
Simon McVittie
smcv at debian.org
Fri Sep 8 10:37:11 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 2a9a529895612145fba29d3417fedb179c26c1fb
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Mon Feb 16 18:52:06 2015 +0000
All: Fix some optimization warnings when building with clang
---
MP/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++------------------
SP/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++------------------
2 files changed, 82 insertions(+), 36 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 68f5318..2d5ff14 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -387,14 +387,20 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ 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
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 -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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -643,15 +649,21 @@ ifeq ($(PLATFORM),mingw32)
endif
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ 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
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 -falign-functions=2 -fstrength-reduce
+ 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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
@@ -672,7 +684,7 @@ ifeq ($(PLATFORM),mingw32)
endif
LIBS= -lws2_32 -lwinmm -lpsapi
- # clang 3.4 doesn't support this
+ # clang 3.5 doesn't support this
ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
CLIENT_LDFLAGS += -mwindows -static-libgcc -static-libstdc++
endif
@@ -806,14 +818,20 @@ ifeq ($(PLATFORM),openbsd)
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ 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
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 -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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -944,14 +962,19 @@ ifeq ($(PLATFORM),sunos)
OPTIMIZEVM = -O3 -funroll-loops
ifeq ($(ARCH),sparc)
- OPTIMIZEVM += -O3 \
- -fstrength-reduce -falign-functions=2 \
- -mtune=ultrasparc3 -mv8plus -mno-faster-structs
+ 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 \
- -falign-functions=2 -fstrength-reduce
+ 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
HAVE_VM_COMPILED=true
BASE_CFLAGS += -m32
CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA
diff --git a/SP/Makefile b/SP/Makefile
index e2b6aa9..2ab980f 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -379,14 +379,20 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ 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
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 -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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -635,15 +641,21 @@ ifeq ($(PLATFORM),mingw32)
endif
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
- -funroll-loops -falign-functions=2 -fstrength-reduce
+ 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
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 -falign-functions=2 -fstrength-reduce
+ 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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED = true
endif
@@ -664,7 +676,7 @@ ifeq ($(PLATFORM),mingw32)
endif
LIBS= -lws2_32 -lwinmm -lpsapi
- # clang 3.4 doesn't support this
+ # clang 3.5 doesn't support this
ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
CLIENT_LDFLAGS += -mwindows -static-libgcc -static-libstdc++
endif
@@ -798,14 +810,20 @@ ifeq ($(PLATFORM),openbsd)
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
ifeq ($(ARCH),x86_64)
- OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
- -falign-functions=2 -fstrength-reduce
+ 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
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 -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
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
else
@@ -936,14 +954,19 @@ ifeq ($(PLATFORM),sunos)
OPTIMIZEVM = -O3 -funroll-loops
ifeq ($(ARCH),sparc)
- OPTIMIZEVM += -O3 \
- -fstrength-reduce -falign-functions=2 \
- -mtune=ultrasparc3 -mv8plus -mno-faster-structs
+ 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 \
- -falign-functions=2 -fstrength-reduce
+ 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
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