[iortcw] 80/497: All: Remove -falign-loops and -falign-jumps from Makefiles

Simon McVittie smcv at debian.org
Fri Sep 8 10:36:29 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 8065534bb65853eb94387621cf0dee09f39f2679
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Mar 24 21:35:26 2014 +0000

    All: Remove -falign-loops and -falign-jumps from Makefiles
---
 MP/Makefile | 31 -------------------------------
 SP/Makefile | 31 -------------------------------
 2 files changed, 62 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 603106b..bec556b 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -364,20 +364,12 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    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
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED=true
   else
@@ -534,9 +526,6 @@ ifeq ($(PLATFORM),darwin)
     $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
   RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
 
-  ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-    OPTIMIZEVM += -falign-loops=16
-  endif
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   SHLIBEXT=dylib
@@ -612,10 +601,6 @@ ifeq ($(PLATFORM),mingw32)
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
       -funroll-loops -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) --fast-math
     HAVE_VM_COMPILED = true
     FILE_ARCH=x64
@@ -623,10 +608,6 @@ ifeq ($(PLATFORM),mingw32)
   ifeq ($(ARCH),x86)
     OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
       -funroll-loops -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED = true
   endif
@@ -772,20 +753,12 @@ ifeq ($(PLATFORM),openbsd)
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    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
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED=true
   else
@@ -924,10 +897,6 @@ ifeq ($(PLATFORM),sunos)
   ifeq ($(ARCH),x86)
     OPTIMIZEVM += -march=i586 -fomit-frame-pointer \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     HAVE_VM_COMPILED=true
     BASE_CFLAGS += -m32
     CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA
diff --git a/SP/Makefile b/SP/Makefile
index db6a54b..3630bfa 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -361,20 +361,12 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    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
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED=true
   else
@@ -531,9 +523,6 @@ ifeq ($(PLATFORM),darwin)
     $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
   RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
 
-  ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-    OPTIMIZEVM += -falign-loops=16
-  endif
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   SHLIBEXT=dylib
@@ -621,10 +610,6 @@ ifeq ($(PLATFORM),mingw32)
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
       -funroll-loops -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) --fast-math
     HAVE_VM_COMPILED = true
     FILE_ARCH=x64
@@ -632,10 +617,6 @@ ifeq ($(PLATFORM),mingw32)
   ifeq ($(ARCH),x86)
     OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
       -funroll-loops -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED = true
   endif
@@ -781,20 +762,12 @@ ifeq ($(PLATFORM),openbsd)
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    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
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    endif
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED=true
   else
@@ -933,10 +906,6 @@ ifeq ($(PLATFORM),sunos)
   ifeq ($(ARCH),x86)
     OPTIMIZEVM += -march=i586 -fomit-frame-pointer \
       -falign-functions=2 -fstrength-reduce
-    # clang 3.4 doesn't support these
-    ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-      OPTIMIZEVM += -falign-loops=2 -falign-jumps=2
-    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